From 224a31a765eb943443640301a715d2d4eb005b79 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Mon, 10 Jul 2017 14:46:25 -0700 Subject: [PATCH] init: add missing submodule arg The submodule argument to Sync_LocalHalf was missing in MetaBranchSwitch, causing submodules not to get synced when the -b/--manifest-branch argument to init is used. Change-Id: Ie86d271abac2020725770be36ead83be3326e64b Signed-off-by: Martin Kelly --- project.py | 4 ++-- subcmds/init.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.py b/project.py index 269fd7e5..9a795272 100644 --- a/project.py +++ b/project.py @@ -2958,14 +2958,14 @@ class MetaProject(Project): self.revisionExpr = base self.revisionId = None - def MetaBranchSwitch(self): + def MetaBranchSwitch(self, submodules=False): """ Prepare MetaProject for manifest branch switch """ # detach and delete manifest branch, allowing a new # branch to take over syncbuf = SyncBuffer(self.config, detach_head=True) - self.Sync_LocalHalf(syncbuf) + self.Sync_LocalHalf(syncbuf, submodules=submodules) syncbuf.Finish() return GitCommand(self, diff --git a/subcmds/init.py b/subcmds/init.py index 65dfd1fd..46cdd23a 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -256,7 +256,7 @@ to update the working directory files. sys.exit(1) if opt.manifest_branch: - m.MetaBranchSwitch() + m.MetaBranchSwitch(submodules=opt.submodules) syncbuf = SyncBuffer(m.config) m.Sync_LocalHalf(syncbuf, submodules=opt.submodules)