fetch: help translators by reusing the same message template

Follow the example set by 12909b6b (i18n: turn "options are
incompatible" into "cannot be used together", 2022-01-05) and use
the same message string to reduce the need for translation.

Reported-by: Jiang Xin <worldhello.net@gmail.com>
Helped-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/fetch.c b/builtin/fetch.c
index dc6e6374288cd0d45a291988c6924525f9dd5c2a..5c329f98358759a0b9a552d528f1f437d6c0087f 100644 (file)
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -2014,7 +2014,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
                        break;
 
                default:
-                       die(_("--negotiate-only and --recurse-submodules cannot be used together"));
+                       die(_("options '%s' and '%s' cannot be used together"),
+                           "--negotiate-only", "--recurse-submodules");
                }
        }
 

diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 3f3ad24299039d1b33b556df1ca67fe853cab707..b83f3f5ffe62964e150a46fd98bd8d428450377f 100755 (executable)
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -630,7 +630,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
 
 test_expect_success 'usage: --negotiate-only with --recurse-submodules' '
        cat >err.expect <<-\EOF &&
-       fatal: --negotiate-only and --recurse-submodules cannot be used together
+       fatal: options '\''--negotiate-only'\'' and '\''--recurse-submodules'\'' cannot be used together
        EOF
 
        test_must_fail git -c protocol.version=2 -C client fetch \