Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk into pm/gitk

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 5500505d8b86fad4d69fe3bca69b8d023737e79e..a6c5bf6ab4c32b123bd7d678d7bd3c5cef6f5cb0 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -108,7 +108,7 @@ test_expect_success \
     'git-archive --format=zip' \
     'git-archive --format=zip HEAD >d.zip'
 
-$UNZIP -v 2>/dev/null
+$UNZIP -v >/dev/null 2>&1
 if [ $? -eq 127 ]; then
        echo "Skipping ZIP tests, because unzip was not found"
        test_done