diff options
-rw-r--r-- | project.py | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1102,7 +1102,9 @@ class Project(object): | |||
1102 | len(local_changes) - cnt_mine) | 1102 | len(local_changes) - cnt_mine) |
1103 | 1103 | ||
1104 | branch.remote = self.GetRemote(self.remote.name) | 1104 | branch.remote = self.GetRemote(self.remote.name) |
1105 | branch.merge = self.revisionExpr | 1105 | if not ID_RE.match(self.revisionExpr): |
1106 | # in case of manifest sync the revisionExpr might be a SHA1 | ||
1107 | branch.merge = self.revisionExpr | ||
1106 | branch.Save() | 1108 | branch.Save() |
1107 | 1109 | ||
1108 | if cnt_mine > 0 and self.rebase: | 1110 | if cnt_mine > 0 and self.rebase: |