diff options
Diffstat (limited to 'manifest_xml.py')
-rw-r--r-- | manifest_xml.py | 6 |
1 files changed, 6 insertions, 0 deletions
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 | |||
1289 | remote = self._default.remote | 1289 | remote = self._default.remote |
1290 | else: | 1290 | else: |
1291 | remote = self._get_remote(node) | 1291 | remote = self._get_remote(node) |
1292 | dest_branch = node.getAttribute('dest-branch') | ||
1293 | upstream = node.getAttribute('upstream') | ||
1292 | 1294 | ||
1293 | named_projects = self._projects[name] | 1295 | named_projects = self._projects[name] |
1294 | if dest_path and not path and len(named_projects) > 1: | 1296 | 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 | |||
1304 | 1306 | ||
1305 | if remote_name: | 1307 | if remote_name: |
1306 | p.remote = remote.ToRemoteSpec(name) | 1308 | p.remote = remote.ToRemoteSpec(name) |
1309 | if dest_branch: | ||
1310 | p.dest_branch = dest_branch | ||
1311 | if upstream: | ||
1312 | p.upstream = upstream | ||
1307 | 1313 | ||
1308 | if dest_path: | 1314 | if dest_path: |
1309 | del self._paths[p.relpath] | 1315 | del self._paths[p.relpath] |