commit 35de228f331101ba17bbc658c3cd910e54725517
author David Pursehouse <david.pursehouse@sonymobile.com> Mon May 11 09:20:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 11 09:20:54 2015 +0000
tree 69f4b4bd1263c8a6f9ab5186c7cf3e9a1b7839a8
parent ace097c36ef2d27991cb8186ddd65ce365f28ee8
parent 382582728ea779aa4cc5e8a7eba2b7b2167efabc

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

project.py

diff --git a/project.py b/project.py
index 4427575..00e41ad 100644
--- a/project.py
+++ b/project.py
@@ -1402,7 +1402,7 @@
     branch = self.GetBranch(name)
     branch.remote = self.GetRemote(self.remote.name)
     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
     revid = self.GetRevisionId(all_refs)