diff options
| author | Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 23:02:24 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-06 00:31:00 +0300 |
| commit | 246cac85055f513626159e8cd20b741eaf5f9f97 (patch) | |
| tree | e6d7e00c0918636199eb430e98ecc62e8980ded7 /t/t2072-restore-pathspec-file.sh | |
| parent | d7d30badbf1ece9c944e41bac4d8aef1117e8b7f (diff) | |
i18n: turn even more messages into "cannot be used together" ones
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 <jn.avila@free.fr>
Reviewed-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2072-restore-pathspec-file.sh')
| -rwxr-xr-x | t/t2072-restore-pathspec-file.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh index af67ca7d52..c22669b39f 100755 --- a/t/t2072-restore-pathspec-file.sh +++ b/t/t2072-restore-pathspec-file.sh @@ -155,7 +155,7 @@ test_expect_success 'error conditions' ' test_i18ngrep -e "options .--pathspec-from-file. and .--patch. cannot be used together" err && test_must_fail git restore --pathspec-from-file=list --source=HEAD^1 -- 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 restore --pathspec-file-nul --source=HEAD^1 2>err && test_i18ngrep -e "the option .--pathspec-file-nul. requires .--pathspec-from-file." err && |