summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--project.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/project.py b/project.py
index 6217aec8..61fddacc 100644
--- a/project.py
+++ b/project.py
@@ -1396,7 +1396,7 @@ class Project(object):
1396 branch = self.GetBranch(name) 1396 branch = self.GetBranch(name)
1397 branch.remote = self.GetRemote(self.remote.name) 1397 branch.remote = self.GetRemote(self.remote.name)
1398 branch.merge = self.revisionExpr 1398 branch.merge = self.revisionExpr
1399 if not branch.merge.startswith('refs/'): 1399 if not branch.merge.startswith('refs/') and not ID_RE.match(self.revisionExpr):
1400 branch.merge = R_HEADS + self.revisionExpr 1400 branch.merge = R_HEADS + self.revisionExpr
1401 revid = self.GetRevisionId(all_refs) 1401 revid = self.GetRevisionId(all_refs)
1402 1402