diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-05-11 09:20:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-11 09:20:54 +0000 |
| commit | 35de228f331101ba17bbc658c3cd910e54725517 (patch) | |
| tree | 69f4b4bd1263c8a6f9ab5186c7cf3e9a1b7839a8 /project.py | |
| parent | ace097c36ef2d27991cb8186ddd65ce365f28ee8 (diff) | |
| parent | 382582728ea779aa4cc5e8a7eba2b7b2167efabc (diff) | |
| download | git-repo-35de228f331101ba17bbc658c3cd910e54725517.tar.gz | |
Merge "Don't attempt to create "fully qualified names" for SHA1s"
Diffstat (limited to 'project.py')
| -rw-r--r-- | project.py | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -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 | ||