From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 28 Oct 2005 03:59:29 +0000 (+0200)
Subject: make t5501 less annoying
X-Git-Tag: v0.99.9~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d7d1670a87743c699aa8a981506c952088dc2d4;p=git.git

make t5501 less annoying

On Linux, "mktemp tmp-XXXX" will not work. Also, redirect stderr on which,
so it does not complain too loudly. After all, this test should only be
executed when old binaries are available.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t5501-old-fetch-and-upload.sh b/t/t5501-old-fetch-and-upload.sh
index 86df78549..ada513032 100755
--- a/t/t5501-old-fetch-and-upload.sh
+++ b/t/t5501-old-fetch-and-upload.sh
@@ -8,7 +8,7 @@
 
 cd $(dirname $0) || exit 1
 
-tmp=$(mktemp tmp-XXXX)
+tmp=$(mktemp /tmp/tmp-XXXXXXXX)
 
 retval=0
 
@@ -25,7 +25,7 @@ for i in $list; do
 	both) pgm="old-git-upload-pack"; replace="old-git-fetch-pack --exec=$pgm";;
 	esac
 
-	if which $pgm; then
+	if which $pgm 2>/dev/null; then
 		echo "Testing with $pgm"
 		sed -e "s/git-fetch-pack/$replace/g" \
 			-e "s/# old fails/warn/" < t5500-fetch-pack.sh > $tmp