From: Junio C Hamano Date: Mon, 15 Apr 2019 04:48:31 +0000 (+0900) Subject: gettext tests: export the restored GIT_TEST_GETTEXT_POISON X-Git-Tag: v2.22.0-rc0~41^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f88b9cb603c0ade5abac63a55465b10e3c58977c;p=git gettext tests: export the restored GIT_TEST_GETTEXT_POISON 6cdccfce ("i18n: make GETTEXT_POISON a runtime option", 2018-11-08) made the gettext-poison test a runtime option (which was a good move) and adjusted the test framework so that Git commands we run as part of the framework, as opposed to the ones that are part of the test proper, are not affected by the setting. The original value for the GIT_TEST_GETTEXT_POISON environment variable is saved away in another variable and gets unset, and then later the saved value is restored to the environment variable. But the code forgot to export the variable again, which is necessary to restore the "export" bit that was lost when the variable was unset. Signed-off-by: Junio C Hamano --- diff --git a/t/test-lib.sh b/t/test-lib.sh index 0f1faa24b2..b3d995f562 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1131,6 +1131,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