Skip to content

Commit de4eaae

Browse files
committed
fetch: help translators by reusing the same message template
Follow the example set by 12909b6 (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 <[email protected]> Helped-by: Glen Choo <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 386c076 commit de4eaae

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

builtin/fetch.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2014,7 +2014,8 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
20142014
break;
20152015

20162016
default:
2017-
die(_("--negotiate-only and --recurse-submodules cannot be used together"));
2017+
die(_("options '%s' and '%s' cannot be used together"),
2018+
"--negotiate-only", "--recurse-submodules");
20182019
}
20192020
}
20202021

t/t5702-protocol-v2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
630630

631631
test_expect_success 'usage: --negotiate-only with --recurse-submodules' '
632632
cat >err.expect <<-\EOF &&
633-
fatal: --negotiate-only and --recurse-submodules cannot be used together
633+
fatal: options '\''--negotiate-only'\'' and '\''--recurse-submodules'\'' cannot be used together
634634
EOF
635635
636636
test_must_fail git -c protocol.version=2 -C client fetch \

0 commit comments

Comments
 (0)