fetch: help translators by reusing the same message template

gitster · gitster · commit de4eaae63a87 · 2022-01-20T15:04:53.000-08:00
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 <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
@@ -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
@@ -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 \

Original file line number	Diff line number	Diff line change
`@@ -2014,7 +2014,8 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`2014`	`2014`	`break;`
`2015`	`2015`
`2016`	`2016`	`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");`
`2018`	`2019`	`}`
`2019`	`2020`	`}`
`2020`	`2021`