summaryrefslogtreecommitdiff
path: root/t/test-lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-01-20 17:22:22 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-20 17:22:22 -0800
commit1bc7a2b38f29e1336c91f57bc88d2391e0f72786 (patch)
treeb4b742d50843a9420d5e80f2a62d29b177eae222 /t/test-lib.sh
parente4f59a32de3f90ff5aabc09b9da6bd5818c5076b (diff)
parent55292ea25dca1f3273b4e59aa37ee66cae4aa343 (diff)
downloadgit-1bc7a2b38f29e1336c91f57bc88d2391e0f72786.tar.gz
Merge branch 'rs/zip-tests' into maint
* rs/zip-tests: t5003: check if unzip supports symlinks t5000, t5003: move ZIP tests into their own script t0024, t5000: use test_lazy_prereq for UNZIP t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead
Diffstat (limited to 't/test-lib.sh')
-rw-r--r--t/test-lib.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index f50f8341d4..fc42d3a9c4 100644
--- 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)