show-ref: use die_for_incompatible_opt3()
Use the standard message for reporting the use of multiple mutually exclusive options by calling die_for_incompatible_opt3() instead of rolling our own. This has the benefits of showing only the actually given options, reducing the number of strings to translate and making the UI slightly more consistent. Adjust the test to no longer insist on a specific order of the reported options, as this implementation detail does not affect the usefulness of the error message. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: René Scharfe <l.s.r@web.de> Reviewed-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Dec 11, 2023 at 09:09 UTC
7382497372f065fefe737333980a8146ede2955c
2 files changed
+12
-10
builtin/show-ref.c
+3
-3
@@ -315,9 +315,9 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
315
argc = parse_options(argc, argv, prefix, show_ref_options,
316
show_ref_usage, 0);
317
318
- if ((!!exclude_existing_opts.enabled + !!verify + !!exists) > 1)
319
- die(_("only one of '%s', '%s' or '%s' can be given"),
320
- "--exclude-existing", "--verify", "--exists");
318
+ die_for_incompatible_opt3(exclude_existing_opts.enabled, "--exclude-existing",
319
+ verify, "--verify",
320
+ exists, "--exists");
321
322
if (exclude_existing_opts.enabled)
323
return cmd_show_ref__exclude_existing(&exclude_existing_opts);
t/t1403-show-ref.sh
+9
-7
@@ -197,18 +197,20 @@ test_expect_success 'show-ref --verify with dangling ref' '
197
'
198
199
test_expect_success 'show-ref sub-modes are mutually exclusive' '
200
- cat >expect <<-EOF &&
201
- fatal: only one of ${SQ}--exclude-existing${SQ}, ${SQ}--verify${SQ} or ${SQ}--exists${SQ} can be given
202
- EOF
203
-
200
test_must_fail git show-ref --verify --exclude-existing 2>err &&
205
- test_cmp expect err &&
201
+ grep "verify" err &&
202
+ grep "exclude-existing" err &&
203
+ grep "cannot be used together" err &&
204
205
test_must_fail git show-ref --verify --exists 2>err &&
208
- test_cmp expect err &&
206
+ grep "verify" err &&
207
+ grep "exists" err &&
208
+ grep "cannot be used together" err &&
209
210
test_must_fail git show-ref --exclude-existing --exists 2>err &&
211
- test_cmp expect err
211
+ grep "exclude-existing" err &&
212
+ grep "exists" err &&
213
+ grep "cannot be used together" err
214
'
215
216
test_expect_success '--exists with existing reference' '