X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft5501-old-fetch-and-upload.sh;h=596c88b1c2f28e91a247309d383c56f3d670fe92;hb=2a0925be3512451834ec9a3e023f4cff23c1cfb7;hp=ada5130328d83b2c6014fdc6f78946cbb4a525bd;hpb=8d7d1670a87743c699aa8a981506c952088dc2d4;p=git.git

diff --git a/t/t5501-old-fetch-and-upload.sh b/t/t5501-old-fetch-and-upload.sh
index ada51303..596c88b1 100755
--- a/t/t5501-old-fetch-and-upload.sh
+++ b/t/t5501-old-fetch-and-upload.sh
@@ -7,8 +7,9 @@
 # an old counterpart
 
 cd $(dirname $0) || exit 1
+: ${SHELL_PATH=/bin/sh}
 
-tmp=$(mktemp /tmp/tmp-XXXXXXXX)
+tmp=`pwd`/.tmp$$
 
 retval=0
 
@@ -25,13 +26,17 @@ for i in $list; do
 	both) pgm="old-git-upload-pack"; replace="old-git-fetch-pack --exec=$pgm";;
 	esac
 
-	if which $pgm 2>/dev/null; then
+	if where=`LANG=C LC_ALL=C which "$pgm" 2>/dev/null` &&
+	   case "$where" in
+	   "no "*) (exit 1) ;;
+	   esac
+	then
 		echo "Testing with $pgm"
 		sed -e "s/git-fetch-pack/$replace/g" \
 			-e "s/# old fails/warn/" < t5500-fetch-pack.sh > $tmp
 
-		sh $tmp || retval=$?
-		rm $tmp
+		"$SHELL_PATH" "$tmp" || retval=$?
+		rm -f "$tmp"
 
 		test $retval != 0 && exit $retval
 	else