Merge branch 'jc/gettext-test-fix'

The GETTEXT_POISON test option has been quite broken ever since it
was made runtime-tunable, which has been fixed.

* jc/gettext-test-fix:
gettext tests: export the restored GIT_TEST_GETTEXT_POISON

diff --git a/t/test-lib.sh b/t/test-lib.sh
index d18387c255413cfe85b3e25f81e2dc70fcd8b4fa..908ddb9c46630d8d9678f610cfde7617bc38514c 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -1439,6 +1439,7 @@ test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
 if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
 then
        GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
+       export GIT_TEST_GETTEXT_POISON
        unset GIT_TEST_GETTEXT_POISON_ORIG
 fi