android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

If revision is sha hash and dest-branch is defined, use it for starting branch

Browse Source 
Change-Id: I538c7d216f72b87629b61aee547d374a398c95da
This commit is contained in:
Max Liu 2014-06-23 14:48:16 +08:00 committed by Hsing-Chieh Liu
parent 7e12e0a2fa
commit 5fb8ed217c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
subcmds/start.py
View File

@ -59,9 +59,13 @@ revision specified in the manifest.
for project in all_projects: for project in all_projects:
pm.update() pm.update()
# If the current revision is a specific SHA1 then we can't push back # If the current revision is a specific SHA1 then we can't push back
# to it so substitute the manifest default revision instead. # to it; so substitute with dest_branch if defined, or with manifest
# default revision instead.
if IsId(project.revisionExpr): if IsId(project.revisionExpr):
project.revisionExpr = self.manifest.default.revisionExpr if project.dest_branch:
project.revisionExpr = project.dest_branch
else:
project.revisionExpr = self.manifest.default.revisionExpr
if not project.StartBranch(nb): if not project.StartBranch(nb):
err.append(project) err.append(project)
pm.end() pm.end()