diff options
| author |  Jean-Noël Avila <jn.avila@free.fr> | 2022-01-05 20:02:14 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-05 13:29:23 -0800 |
| commit | 43ea635c35371b22a7a2010398d47040c5b95adc (patch) | |
| tree | 39fdf40eba05aba61c7bf2fcfae638bdd66abc09 /t | |
| parent | The fifth batch (diff) | |
| download | tgif-43ea635c35371b22a7a2010398d47040c5b95adc.tar.xz | |
i18n: refactor "foo and bar are mutually exclusive"
Use static strings for constant parts of the sentences. They are all
turned into "cannot be used together".
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')
| -rwxr-xr-x | t/t0001-init.sh | 2 | ||||
| -rwxr-xr-x | t/t2025-checkout-no-overlay.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 7603ad2f82..3235ab4d53 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -331,7 +331,7 @@ test_expect_success 'init with separate gitdir' ' test_expect_success 'explicit bare & --separate-git-dir incompatible' ' test_must_fail git init --bare --separate-git-dir goop.git bare.git 2>err && - test_i18ngrep "mutually exclusive" err + test_i18ngrep "cannot be used together" err ' test_expect_success 'implicit bare & --separate-git-dir incompatible' ' diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh index fa9e098706..8f13341cf8 100755 --- a/t/t2025-checkout-no-overlay.sh +++ b/t/t2025-checkout-no-overlay.sh @@ -25,7 +25,7 @@ test_expect_success 'checkout --no-overlay removing last file from directory' ' test_expect_success 'checkout -p --overlay is disallowed' ' test_must_fail git checkout -p --overlay HEAD 2>actual && - test_i18ngrep "fatal: -p and --overlay are mutually exclusive" actual + test_i18ngrep "fatal: options .-p. and .--overlay. cannot be used together" actual ' test_expect_success '--no-overlay --theirs with D/F conflict deletes file' ' |