From 619a2b58871e03ecc4f40b93a183206b51853fa5 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Thu, 6 Feb 2020 17:00:00 -0800 Subject: Fix inverted logic around [gitc-]init and -c Instead of not using '-c' for '--current-branch' when using gitc, we were only using '-c' when using gitc, so we still had the conflict with the gitc option, and other users still couldn't use '-c'. Test: repo init -u https://android.googlesource.com/platform/manifest; repo init -c Test: repo gitc-init -u ... -b ... -c testing Change-Id: I71e4950a49c281418249f0783c6a2ea34f0d3e2b Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/253795 Reviewed-by: Mike Frysinger Tested-by: Dan Willemsen (cherry picked from commit 93293ca47f3a898b30eecf21e7b4e1038780c867) --- subcmds/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subcmds/init.py b/subcmds/init.py index f4229f62..6594a602 100644 --- a/subcmds/init.py +++ b/subcmds/init.py @@ -99,7 +99,7 @@ to update the working directory files. cbr_opts = ['--current-branch'] # The gitc-init subcommand allocates -c itself, but a lot of init users # want -c, so try to satisfy both as best we can. - if gitc_init: + if not gitc_init: cbr_opts += ['-c'] g.add_option(*cbr_opts, dest='current_branch_only', action='store_true', -- cgit v1.2.3-54-g00ecf