diff options
Diffstat (limited to 'project.py')
-rw-r--r-- | project.py | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1326,6 +1326,8 @@ class Project(object): | |||
1326 | if not ID_RE.match(self.revisionExpr): | 1326 | if not ID_RE.match(self.revisionExpr): |
1327 | # in case of manifest sync the revisionExpr might be a SHA1 | 1327 | # in case of manifest sync the revisionExpr might be a SHA1 |
1328 | branch.merge = self.revisionExpr | 1328 | branch.merge = self.revisionExpr |
1329 | if not branch.merge.startswith('refs/'): | ||
1330 | branch.merge = R_HEADS + branch.merge | ||
1329 | branch.Save() | 1331 | branch.Save() |
1330 | 1332 | ||
1331 | if cnt_mine > 0 and self.rebase: | 1333 | if cnt_mine > 0 and self.rebase: |
@@ -1394,6 +1396,8 @@ class Project(object): | |||
1394 | branch = self.GetBranch(name) | 1396 | branch = self.GetBranch(name) |
1395 | branch.remote = self.GetRemote(self.remote.name) | 1397 | branch.remote = self.GetRemote(self.remote.name) |
1396 | branch.merge = self.revisionExpr | 1398 | branch.merge = self.revisionExpr |
1399 | if not branch.merge.startswith('refs/'): | ||
1400 | branch.merge = R_HEADS + self.revisionExpr | ||
1397 | revid = self.GetRevisionId(all_refs) | 1401 | revid = self.GetRevisionId(all_refs) |
1398 | 1402 | ||
1399 | if head.startswith(R_HEADS): | 1403 | if head.startswith(R_HEADS): |