Merge branch 'ap/status-ignored-in-ignored-directory' into maint

diff --git a/t/test-lib.sh b/t/test-lib.sh
index f50f8341d40c6ec87565d01a263d97209fb68680..fc42d3a9c4f7e0bf98b657826163a04f2905f366 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -85,6 +85,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
                .*_TEST
                PROVE
                VALGRIND
+               UNZIP
                PERF_AGGREGATING_LATER
        ));
        my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
@@ -128,6 +129,7 @@ fi
 unset CDPATH
 
 unset GREP_OPTIONS
+unset UNZIP
 
 case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
 1|2|true)