From: Johannes Schindelin <johannes.schindelin@xxxxxx> The idea of the `GETTEXT_POISON` mode is to test translated messages, at least _somewhat_. There is not really any point in turning off that mode by force, except _maybe_ to test the mode itself. So let's avoid overriding `GIT_TEST_GETTEXT_POISON` in the test suite unless testing the `GETTEXT_POISON` functionality itself. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- t/t0017-env-helper.sh | 6 ++---- t/t1305-config-include.sh | 6 ++---- t/t7201-co.sh | 4 ++-- t/t9902-completion.sh | 1 - 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh index c1ecf6aeac6..e0931310306 100755 --- a/t/t0017-env-helper.sh +++ b/t/t0017-env-helper.sh @@ -85,10 +85,8 @@ test_expect_success 'env--helper reads config thanks to trace2' ' git config -f home/.gitconfig include.path cycle && git config -f home/cycle include.path .gitconfig && - test_must_fail \ - env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=false \ - git config -l 2>err && - grep "exceeded maximum include depth" err && + test_must_fail env HOME="$(pwd)/home" git config -l 2>err && + test_i18ngrep "exceeded maximum include depth" err && test_must_fail \ env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=true \ diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index f1e1b289f98..308c5d530b3 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh @@ -352,10 +352,8 @@ test_expect_success 'include cycles are detected' ' git init --bare cycle && git -C cycle config include.path cycle && git config -f cycle/cycle include.path config && - test_must_fail \ - env GIT_TEST_GETTEXT_POISON=false \ - git -C cycle config --get-all test.value 2>stderr && - grep "exceeded maximum include depth" stderr + test_must_fail git -C cycle config --get-all test.value 2>stderr && + test_i18ngrep "exceeded maximum include depth" stderr ' test_done diff --git a/t/t7201-co.sh b/t/t7201-co.sh index b36a93056fd..630406a73c5 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -245,8 +245,8 @@ test_expect_success 'checkout to detach HEAD' ' rev=$(git rev-parse --short renamer^) && git checkout -f renamer && git clean -f && - GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages && - grep "HEAD is now at $rev" messages && + git checkout renamer^ 2>messages && + test_i18ngrep "HEAD is now at $rev" messages && test_line_count -gt 1 messages && H=$(git rev-parse --verify HEAD) && M=$(git show-ref -s --verify refs/heads/master) && diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index a1c4f1f6d40..e5adee27d41 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2363,7 +2363,6 @@ test_expect_success 'sourcing the completion script clears cached commands' ' ' test_expect_success 'sourcing the completion script clears cached merge strategies' ' - GIT_TEST_GETTEXT_POISON=false && __git_compute_merge_strategies && verbose test -n "$__git_merge_strategies" && . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" && -- gitgitgadget
