diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:23 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-25 16:41:23 +0900 |
commit | 49f50f58cb664d39ccf047342d05a763471a9420 (patch) | |
tree | 69ce46be5968f721e892d16fb60cf2397b834488 /t/test-lib.sh | |
parent | 57a6b93236f3b1667a1947d3fc83f6e942d3bfca (diff) | |
parent | f88b9cb603c0ade5abac63a55465b10e3c58977c (diff) | |
download | git-49f50f58cb664d39ccf047342d05a763471a9420.tar.gz |
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
Diffstat (limited to 't/test-lib.sh')
-rw-r--r-- | t/test-lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index d18387c255..908ddb9c46 100644 --- 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 |