Merge branch 'ap/combine-diff-ignore-whitespace'

diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 6a33606d28eba61281252cf28f6d5820dc452f1d..4e7b05dd2391125b1c9e58404c552647107099cd 100755 (executable)
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -3,15 +3,9 @@
 test_description='git archive --format=zip test'
 
 . ./test-lib.sh
-GIT_UNZIP=${GIT_UNZIP:-unzip}
 
 SUBSTFORMAT=%H%n
 
-test_lazy_prereq UNZIP '
-       "$GIT_UNZIP" -v
-       test $? -ne 127
-'
-
 test_lazy_prereq UNZIP_SYMLINKS '
        (
                mkdir unzip-symlinks &&