Merge branch 'jc/make-dedup-ls-files-output'

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 38b157075a79bb7674394f4856a9781e2db22cae..908ddb9c46630d8d9678f610cfde7617bc38514c 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -386,6 +386,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
        my @env = keys %ENV;
        my $ok = join("|", qw(
                TRACE
+               TR2_
                DEBUG
                TEST
                .*_TEST
@@ -1438,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