From 246cac85055f513626159e8cd20b741eaf5f9f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Wed, 5 Jan 2022 20:02:24 +0000 Subject: i18n: turn even more messages into "cannot be used together" ones MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even if some of these messages are not subject to gettext i18n, this helps bring a single style of message for a given error type. Signed-off-by: Jean-Noël Avila Reviewed-by: Johannes Sixt Signed-off-by: Junio C Hamano --- t/t3704-add-pathspec-file.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t3704-add-pathspec-file.sh') diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh index 47ad96bf66..4e6b5177c9 100755 --- a/t/t3704-add-pathspec-file.sh +++ b/t/t3704-add-pathspec-file.sh @@ -147,7 +147,7 @@ test_expect_success 'error conditions' ' test_i18ngrep -e "options .--pathspec-from-file. and .--edit. cannot be used together" err && test_must_fail git add --pathspec-from-file=list -- fileA.t 2>err && - test_i18ngrep -e "--pathspec-from-file is incompatible with pathspec arguments" err && + test_i18ngrep -e ".--pathspec-from-file. and pathspec arguments cannot be used together" err && test_must_fail git add --pathspec-file-nul 2>err && test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && -- cgit v1.2.3