development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-06 00:29:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

builtin/show-ref: ensure mutual exclusiveness of subcommands

Browse source 
The git-show-ref(1) command has three different modes, of which one is
implicit and the other two can be chosen explicitly by passing a flag.
But while these modes are standalone and cause us to execute completely
separate code paths, we gladly accept the case where a user asks for
both `--exclude-existing` and `--verify` at the same time even though it
is not obvious what will happen. Spoiler: we ignore `--verify` and
execute the `--exclude-existing` mode.

Let's explicitly detect this invalid usage and die in case both modes
were requested.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2023-10-31 09:16:46 +01:00 committed by Junio C Hamano
parent ee26f1e29a
commit 199970e72f
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
builtin/show-ref.c
View file

@ -275,6 +275,10 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, show_ref_options, argc = parse_options(argc, argv, prefix, show_ref_options,
show_ref_usage, 0); show_ref_usage, 0);
if ((!!exclude_existing_opts.enabled + !!verify) > 1)
die(_("only one of '%s' or '%s' can be given"),
"--exclude-existing", "--verify");
if (exclude_existing_opts.enabled) if (exclude_existing_opts.enabled)
return cmd_show_ref__exclude_existing(&exclude_existing_opts); return cmd_show_ref__exclude_existing(&exclude_existing_opts);
else if (verify) else if (verify)

9
t/t1403-show-ref.sh
View file

@ -196,4 +196,13 @@ test_expect_success 'show-ref --verify with dangling ref' '
) )
' '
test_expect_success 'show-ref sub-modes are mutually exclusive' '
cat >expect <<-EOF &&
fatal: only one of ${SQ}--exclude-existing${SQ} or ${SQ}--verify${SQ} can be given
EOF
test_must_fail git show-ref --verify --exclude-existing 2>err &&
test_cmp expect err
'
test_done test_done