summaryrefslogtreecommitdiffstats
path: root/subcmds/sync.py
diff options
context:
space:
mode:
authorMartin Kelly <mkelly@xevo.com>2017-03-21 16:05:12 -0700
committerMartin Kelly <mkelly@xevo.com>2017-05-23 16:51:31 -0700
commite4e94d26ae81dbc9eb6e2f345fac7cd8c533cb9a (patch)
tree1fe598a2b3e89ae9a56fd640e6cd5b53a8704c7a /subcmds/sync.py
parentffb4b890997b1799f188ec44f005d949feb643a7 (diff)
downloadgit-repo-e4e94d26ae81dbc9eb6e2f345fac7cd8c533cb9a.tar.gz
init: add --submodules to sync manifest submodules
repo sync can sync submodules via the --fetch-submodules option. However, if the manifest repo has submodules, those will not be synced. Having submodules in the manifest repo -- while not commonly done -- can be useful for inheriting a manifest from another project using <include> and layering changes on top of it. In this way, you can avoid having to deal with merge conflicts between your own manifests and the other project's manifests (for example, if you're managing an Android fork). Add a --submodule option to init that automatically syncs the submodules in the manifest repo whenever the manifest repo changes. Change-Id: I45d34f04517774c1462d7f233f482d1d81a332a8 Signed-off-by: Martin Kelly <mkelly@xevo.com>
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r--subcmds/sync.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 8e8529ee..82056f33 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -723,11 +723,12 @@ later is required to fix a server side protocol bug.
723 mp.Sync_NetworkHalf(quiet=opt.quiet, 723 mp.Sync_NetworkHalf(quiet=opt.quiet,
724 current_branch_only=opt.current_branch_only, 724 current_branch_only=opt.current_branch_only,
725 no_tags=opt.no_tags, 725 no_tags=opt.no_tags,
726 optimized_fetch=opt.optimized_fetch) 726 optimized_fetch=opt.optimized_fetch,
727 submodules=self.manifest.HasSubmodules)
727 728
728 if mp.HasChanges: 729 if mp.HasChanges:
729 syncbuf = SyncBuffer(mp.config) 730 syncbuf = SyncBuffer(mp.config)
730 mp.Sync_LocalHalf(syncbuf) 731 mp.Sync_LocalHalf(syncbuf, submodules=self.manifest.HasSubmodules)
731 if not syncbuf.Finish(): 732 if not syncbuf.Finish():
732 sys.exit(1) 733 sys.exit(1)
733 self._ReloadManifest(manifest_name) 734 self._ReloadManifest(manifest_name)