android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo: fix bug with --standalone-manifest

Browse Source 
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 <jackneus@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
Jack Neus 2021-10-11 17:20:39 +00:00
parent 6a74c91f50
commit 76491590b8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
subcmds/init.py
View File

@ -166,12 +166,14 @@ to update the working directory files.
standalone_manifest = False standalone_manifest = False
if opt.standalone_manifest: if opt.standalone_manifest:
standalone_manifest = True 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 # 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 # standalone mode. Otherwise, use config to infer what we were in the last
# init. # init.
standalone_manifest = bool(m.config.GetString('manifest.standalone')) 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) self._ConfigureDepth(opt)