From 4cdfdb77343b2d4664c0a13c9e485a02988e578f Mon Sep 17 00:00:00 2001 From: Erik Elmeke Date: Fri, 9 Sep 2022 17:13:17 +0200 Subject: manifest: allow extend-project to override dest-branch and upstream Bug: https://crbug.com/gerrit/16238 Change-Id: Id6eff34791525b3df690e160c911c0286331984b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/345144 Tested-by: Erik Elmeke Reviewed-by: Mike Frysinger --- manifest_xml.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'manifest_xml.py') diff --git a/manifest_xml.py b/manifest_xml.py index b7579d5d..129eb3f7 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -1289,6 +1289,8 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md remote = self._default.remote else: remote = self._get_remote(node) + dest_branch = node.getAttribute('dest-branch') + upstream = node.getAttribute('upstream') named_projects = self._projects[name] if dest_path and not path and len(named_projects) > 1: @@ -1304,6 +1306,10 @@ https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md if remote_name: p.remote = remote.ToRemoteSpec(name) + if dest_branch: + p.dest_branch = dest_branch + if upstream: + p.upstream = upstream if dest_path: del self._paths[p.relpath] -- cgit v1.2.3-54-g00ecf