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>

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 7aac525a878b3b3ae4959a831de4747d379e140f..59d2291cbfebc2ac735869c726092c650e7db184 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -315,9 +315,9 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
        argc = parse_options(argc, argv, prefix, show_ref_options,
                             show_ref_usage, 0);
 
-       if ((!!exclude_existing_opts.enabled + !!verify + !!exists) > 1)
-               die(_("only one of '%s', '%s' or '%s' can be given"),
-                   "--exclude-existing", "--verify", "--exists");
+       die_for_incompatible_opt3(exclude_existing_opts.enabled, "--exclude-existing",
+                                 verify, "--verify",
+                                 exists, "--exists");
 
        if (exclude_existing_opts.enabled)
                return cmd_show_ref__exclude_existing(&exclude_existing_opts);

diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index b50ae6fcf115abe384444db1ef0ddbf04ce247d3..d477689e33364402e7512f1ee461d192bb5361b9 100755 (executable)
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -197,18 +197,20 @@ 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}, ${SQ}--verify${SQ} or ${SQ}--exists${SQ} can be given
-       EOF
-
        test_must_fail git show-ref --verify --exclude-existing 2>err &&
-       test_cmp expect err &&
+       grep "verify" err &&
+       grep "exclude-existing" err &&
+       grep "cannot be used together" err &&
 
        test_must_fail git show-ref --verify --exists 2>err &&
-       test_cmp expect err &&
+       grep "verify" err &&
+       grep "exists" err &&
+       grep "cannot be used together" err &&
 
        test_must_fail git show-ref --exclude-existing --exists 2>err &&
-       test_cmp expect err
+       grep "exclude-existing" err &&
+       grep "exists" err &&
+       grep "cannot be used together" err
 '
 
 test_expect_success '--exists with existing reference' '