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 4427575e..00e41ada 100644
--- a/project.py
+++ b/project.py
@@ -1402,7 +1402,7 @@ class Project(object):
1402 branch = self.GetBranch(name) 1402 branch = self.GetBranch(name)
1403 branch.remote = self.GetRemote(self.remote.name) 1403 branch.remote = self.GetRemote(self.remote.name)
1404 branch.merge = self.revisionExpr 1404 branch.merge = self.revisionExpr
1405 if not branch.merge.startswith('refs/'): 1405 if not branch.merge.startswith('refs/') and not ID_RE.match(self.revisionExpr):
1406 branch.merge = R_HEADS + self.revisionExpr 1406 branch.merge = R_HEADS + self.revisionExpr
1407 revid = self.GetRevisionId(all_refs) 1407 revid = self.GetRevisionId(all_refs)
1408 1408