undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: help translators by reusing the same message template

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2022-01-20 13:58:43 -08:00
parent 386c076a86
commit de4eaae63a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fetch.c
View File

@ -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");
}
}

2
t/t5702-protocol-v2.sh
View File

@ -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 \