summaryrefslogtreecommitdiff
path: root/t/t1305-config-include.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-02-10 22:48:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-10 22:48:33 (GMT)
commit466f94ec45e6170730f9dfaf7185a26f2e9fa8bf (patch)
tree94c611b389a658d7581175b8ac4407e6f6ac79fb /t/t1305-config-include.sh
parent59ace284f33fe9928fcdb04b02044c921fd6905e (diff)
parent73c01d25fe254208befe099a659916d2bff5bbb4 (diff)
downloadgit-466f94ec45e6170730f9dfaf7185a26f2e9fa8bf.zip
git-466f94ec45e6170730f9dfaf7185a26f2e9fa8bf.tar.gz
git-466f94ec45e6170730f9dfaf7185a26f2e9fa8bf.tar.bz2
Merge branch 'ab/detox-gettext-tests'
Get rid of "GETTEXT_POISON" support altogether, which may or may not be controversial. * ab/detox-gettext-tests: tests: remove uses of GIT_TEST_GETTEXT_POISON=false tests: remove support for GIT_TEST_GETTEXT_POISON ci: remove GETTEXT_POISON jobs
Diffstat (limited to 't/t1305-config-include.sh')
-rwxr-xr-xt/t1305-config-include.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index 938ca17..ccbb116 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -352,9 +352,7 @@ 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 &&
+ test_must_fail git -C cycle config --get-all test.value 2>stderr &&
grep "exceeded maximum include depth" stderr
'