Merge "Don't attempt to create "fully qualified names" for SHA1s"

This commit is contained in:
David Pursehouse 2015-05-11 09:20:52 +00:00 committed by Gerrit Code Review
commit 35de228f33

View File

@ -1402,7 +1402,7 @@ class Project(object):
branch = self.GetBranch(name) branch = self.GetBranch(name)
branch.remote = self.GetRemote(self.remote.name) branch.remote = self.GetRemote(self.remote.name)
branch.merge = self.revisionExpr branch.merge = self.revisionExpr
if not branch.merge.startswith('refs/'): if not branch.merge.startswith('refs/') and not ID_RE.match(self.revisionExpr):
branch.merge = R_HEADS + self.revisionExpr branch.merge = R_HEADS + self.revisionExpr
revid = self.GetRevisionId(all_refs) revid = self.GetRevisionId(all_refs)