tests: remove uses of GIT_TEST_GETTEXT_POISON=false
As noted in previous commits we are removing the use of GIT_TEST_GETTEXT_POISON=false. These tests all relied on the facility being off, it always is off after an earlier change, but we hadn't removed the redundant assignments to "false" in the tests. I'm preserving the deletion of "error" lines in 38b9197a76a (t5411: add basic test cases for proc-receive hook, 2020-08-27), it turns out that's useful even without GIT_TEST_GETTEXT_POISON=true in play. Update a comment added in that commit to note that. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jan 20, 2021 at 19:27 UTC
73c01d25fe254208befe099a659916d2bff5bbb4
4 files changed
+4
-8
t/t1305-config-include.sh
+1
-3
@@ -352,9 +352,7 @@ test_expect_success 'include cycles are detected' '
352
git init --bare cycle &&
353
git -C cycle config include.path cycle &&
354
git config -f cycle/cycle include.path config &&
355
- test_must_fail \
356
- env GIT_TEST_GETTEXT_POISON=false \
357
- git -C cycle config --get-all test.value 2>stderr &&
355
+ test_must_fail git -C cycle config --get-all test.value 2>stderr &&
356
grep "exceeded maximum include depth" stderr
357
'
358
t/t5411/common-functions.sh
+2
-3
@@ -36,9 +36,8 @@ create_commits_in () {
36
# without having to worry about future changes of the commit ID and spaces
37
# of the output. Single quotes are replaced with double quotes, because
38
# it is boring to prepare unquoted single quotes in expect text. We also
39
-# remove some locale error messages, which break test if we turn on
40
-# `GIT_TEST_GETTEXT_POISON=true` in order to test unintentional translations
41
-# on plumbing commands.
39
+# remove some locale error messages. The emitted human-readable errors are
40
+# redundant to the more machine-readable output the tests already assert.
41
make_user_friendly_and_stable_output () {
42
sed \
43
-e "s/ *\$//" \
t/t7201-co.sh
+1
-1
@@ -245,7 +245,7 @@ test_expect_success 'checkout to detach HEAD' '
245
rev=$(git rev-parse --short renamer^) &&
246
git checkout -f renamer &&
247
git clean -f &&
248
- GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
248
+ git checkout renamer^ 2>messages &&
249
grep "HEAD is now at $rev" messages &&
250
test_line_count -gt 1 messages &&
251
H=$(git rev-parse --verify HEAD) &&
t/t9902-completion.sh
-1
@@ -2363,7 +2363,6 @@ test_expect_success 'sourcing the completion script clears cached commands' '
2363
'
2364
2365
test_expect_success 'sourcing the completion script clears cached merge strategies' '
2366
- GIT_TEST_GETTEXT_POISON=false &&
2366
__git_compute_merge_strategies &&
2367
verbose test -n "$__git_merge_strategies" &&
2368
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&