diff options
Diffstat (limited to 'subcmds/init.py')
-rw-r--r-- | subcmds/init.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/subcmds/init.py b/subcmds/init.py index bb7187d7..b260ec0f 100644 --- a/subcmds/init.py +++ b/subcmds/init.py | |||
@@ -111,6 +111,9 @@ to update the working directory files. | |||
111 | dest='archive', action='store_true', | 111 | dest='archive', action='store_true', |
112 | help='checkout an archive instead of a git repository for ' | 112 | help='checkout an archive instead of a git repository for ' |
113 | 'each project. See git archive.') | 113 | 'each project. See git archive.') |
114 | g.add_option('--submodules', | ||
115 | dest='submodules', action='store_true', | ||
116 | help='sync any submodules associated with the manifest repo') | ||
114 | g.add_option('-g', '--groups', | 117 | g.add_option('-g', '--groups', |
115 | dest='groups', default='default', | 118 | dest='groups', default='default', |
116 | help='restrict manifest projects to ones with specified ' | 119 | help='restrict manifest projects to ones with specified ' |
@@ -236,10 +239,13 @@ to update the working directory files. | |||
236 | 'in another location.', file=sys.stderr) | 239 | 'in another location.', file=sys.stderr) |
237 | sys.exit(1) | 240 | sys.exit(1) |
238 | 241 | ||
242 | if opt.submodules: | ||
243 | m.config.SetString('repo.submodules', 'true') | ||
244 | |||
239 | if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet, | 245 | if not m.Sync_NetworkHalf(is_new=is_new, quiet=opt.quiet, |
240 | clone_bundle=not opt.no_clone_bundle, | 246 | clone_bundle=not opt.no_clone_bundle, |
241 | current_branch_only=opt.current_branch_only, | 247 | current_branch_only=opt.current_branch_only, |
242 | no_tags=opt.no_tags): | 248 | no_tags=opt.no_tags, submodules=opt.submodules): |
243 | r = m.GetRemote(m.remote.name) | 249 | r = m.GetRemote(m.remote.name) |
244 | print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr) | 250 | print('fatal: cannot obtain manifest %s' % r.url, file=sys.stderr) |
245 | 251 | ||
@@ -253,7 +259,7 @@ to update the working directory files. | |||
253 | m.MetaBranchSwitch() | 259 | m.MetaBranchSwitch() |
254 | 260 | ||
255 | syncbuf = SyncBuffer(m.config) | 261 | syncbuf = SyncBuffer(m.config) |
256 | m.Sync_LocalHalf(syncbuf) | 262 | m.Sync_LocalHalf(syncbuf, submodules=opt.submodules) |
257 | syncbuf.Finish() | 263 | syncbuf.Finish() |
258 | 264 | ||
259 | if is_new or m.CurrentBranch is None: | 265 | if is_new or m.CurrentBranch is None: |