summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChad Jones <chadj@google.com>2012-06-14 16:53:40 -0700
committerChad Jones <chadj@google.com>2012-06-14 16:54:32 -0700
commit87636f2ac2d8a10e7db3be7b5dd47097cc1084ce (patch)
tree3a85dea53c22e8e98b5a1042be5311776ec7020e
parent337aee0a9c6714027ff4fa8659879b0710e2e6aa (diff)
downloadgit-repo-87636f2ac2d8a10e7db3be7b5dd47097cc1084ce.tar.gz
Fix for failures with repo upload for projects that have a SHA1 for a revision; instead use the default manifest revisionv1.9.5
Change-Id: Ie5ef5a45ed6b0ca1a52a550df3cd7bd72e745f5f
-rw-r--r--subcmds/start.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/subcmds/start.py b/subcmds/start.py
index ae2985d2..00885076 100644
--- a/subcmds/start.py
+++ b/subcmds/start.py
@@ -15,6 +15,7 @@
15 15
16import sys 16import sys
17from command import Command 17from command import Command
18from git_config import IsId
18from git_command import git 19from git_command import git
19from progress import Progress 20from progress import Progress
20 21
@@ -56,6 +57,10 @@ revision specified in the manifest.
56 pm = Progress('Starting %s' % nb, len(all)) 57 pm = Progress('Starting %s' % nb, len(all))
57 for project in all: 58 for project in all:
58 pm.update() 59 pm.update()
60 # If the current revision is a specific SHA1 then we can't push back
61 # to it so substitute the manifest default revision instead.
62 if IsId(project.revisionExpr):
63 project.revisionExpr = self.manifest.default.revisionExpr
59 if not project.StartBranch(nb): 64 if not project.StartBranch(nb):
60 err.append(project) 65 err.append(project)
61 pm.end() 66 pm.end()