summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-10-28 03:59:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-29 05:57:01 (GMT)
commit8d7d1670a87743c699aa8a981506c952088dc2d4 (patch)
tree3aaba421c5df763c583fd4bcfa48ba9f54447c17
parent1f5881bb5f4da97d0bb23024ae91079137326c7e (diff)
downloadgit-8d7d1670a87743c699aa8a981506c952088dc2d4.zip
git-8d7d1670a87743c699aa8a981506c952088dc2d4.tar.gz
git-8d7d1670a87743c699aa8a981506c952088dc2d4.tar.bz2
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>
-rwxr-xr-xt/t5501-old-fetch-and-upload.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t5501-old-fetch-and-upload.sh b/t/t5501-old-fetch-and-upload.sh
index 86df785..ada5130 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