diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-22 01:40:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:30:43 +0300 |
| commit | 1ed4bef6b438d25ce605f6bdefb4c98569dad137 (patch) | |
| tree | eddeffb3f20bdc8cee1317de28bc5ee8c4f56bad /t/t0012-help.sh | |
| parent | ff76fc841f4787e7c91329ecda280f293100eccb (diff) | |
help: correct logic error in combining --all and --config
Fix a bug in the --config option that's been there ever since its
introduction in 3ac68a93fd2 (help: add --config to list all available
config, 2018-05-26). Die when --all and --config are combined,
combining them doesn't make sense.
The code for the --config option when combined with an earlier
refactoring done to support the --guide option in
65f98358c0c (builtin/help.c: add --guide option, 2013-04-02) would
cause us to take the "--all" branch early and ignore the --config
option.
Let's instead list these as incompatible, both in the synopsis and
help output, and enforce it in the code itself.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0012-help.sh')
| -rwxr-xr-x | t/t0012-help.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t0012-help.sh b/t/t0012-help.sh index 63c4adb99b..b4ed6229ed 100755 --- a/t/t0012-help.sh +++ b/t/t0012-help.sh @@ -35,7 +35,8 @@ test_expect_success 'basic help commands' ' ' test_expect_success 'invalid usage' ' - test_expect_code 129 git help -g add + test_expect_code 129 git help -g add && + test_expect_code 129 git help -a -c ' test_expect_success "works for commands and guides by default" ' |