From 76491590b890e5be70bd17996c12ff2a8fe1e218 Mon Sep 17 00:00:00 2001 From: Jack Neus Date: Mon, 11 Oct 2021 17:20:39 +0000 Subject: [PATCH] repo: fix bug with --standalone-manifest We were accidentally always setting manifest.standlone in config, which was messing up behavior for standard use cases. BUG=gerrit:15160 TEST=manual runs Change-Id: Ic80f084ae97de5721aced3bb52d3ea9115f8d833 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/320715 Tested-by: Jack Neus Reviewed-by: Mike Frysinger --- subcmds/init.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/subcmds/init.py b/subcmds/init.py index 9c6b2ad9..53c6ba04 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -166,12 +166,14 @@ to update the working directory files. standalone_manifest = False if opt.standalone_manifest: standalone_manifest = True - elif not opt.manifest_url: + m.config.SetString('manifest.standalone', opt.manifest_url) + elif not opt.manifest_url and not opt.manifest_branch: # If -u is set and --standalone-manifest is not, then we're not in # standalone mode. Otherwise, use config to infer what we were in the last # init. standalone_manifest = bool(m.config.GetString('manifest.standalone')) - m.config.SetString('manifest.standalone', opt.manifest_url) + if not standalone_manifest: + m.config.SetString('manifest.standalone', None) self._ConfigureDepth(opt)