Skip to content

Commit 73c01d2

Browse files
avargitster
authored andcommitted
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 38b9197 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d162b25 commit 73c01d2

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

t/t1305-config-include.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,7 @@ test_expect_success 'include cycles are detected' '
352352
git init --bare cycle &&
353353
git -C cycle config include.path cycle &&
354354
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 &&
358356
grep "exceeded maximum include depth" stderr
359357
'
360358

t/t5411/common-functions.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ create_commits_in () {
3636
# without having to worry about future changes of the commit ID and spaces
3737
# of the output. Single quotes are replaced with double quotes, because
3838
# 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.
4241
make_user_friendly_and_stable_output () {
4342
sed \
4443
-e "s/ *\$//" \

t/t7201-co.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ test_expect_success 'checkout to detach HEAD' '
245245
rev=$(git rev-parse --short renamer^) &&
246246
git checkout -f renamer &&
247247
git clean -f &&
248-
GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
248+
git checkout renamer^ 2>messages &&
249249
grep "HEAD is now at $rev" messages &&
250250
test_line_count -gt 1 messages &&
251251
H=$(git rev-parse --verify HEAD) &&

t/t9902-completion.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2363,7 +2363,6 @@ test_expect_success 'sourcing the completion script clears cached commands' '
23632363
'
23642364

23652365
test_expect_success 'sourcing the completion script clears cached merge strategies' '
2366-
GIT_TEST_GETTEXT_POISON=false &&
23672366
__git_compute_merge_strategies &&
23682367
verbose test -n "$__git_merge_strategies" &&
23692368
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&

0 commit comments

Comments
 (0)