From cd7c5deca0b0594bd8addd5a0fe18b962d2679e9 Mon Sep 17 00:00:00 2001 From: Anatol Pomazau Date: Tue, 20 Mar 2012 13:45:00 -0700 Subject: Do not change branch.foo.merge in case of manifest sync In case of manifest/smart sync repo changes ".merge" config option from branch to SHA. Doing 'repo upload' fails as repo tries to upload to a remote branch that looks like SHA (e.g. refs/for/23423423423423423423423) Do not update the .merge in case if revision is SHA. Change-Id: I9139708fa17f21eec5a7e23c3255333626bf529e --- project.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'project.py') diff --git a/project.py b/project.py index 350a5e33..b80ad319 100644 --- a/project.py +++ b/project.py @@ -1102,7 +1102,9 @@ class Project(object): len(local_changes) - cnt_mine) branch.remote = self.GetRemote(self.remote.name) - branch.merge = self.revisionExpr + if not ID_RE.match(self.revisionExpr): + # in case of manifest sync the revisionExpr might be a SHA1 + branch.merge = self.revisionExpr branch.Save() if cnt_mine > 0 and self.rebase: -- cgit v1.2.3-54-g00ecf