mirror of
https://github.com/Dev-Wiki/git-repo.git
synced 2025-02-23 23:27:27 +08:00
Merge "Don't attempt to create "fully qualified names" for SHA1s"
This commit is contained in:
commit
35de228f33
@ -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)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user