summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 20:26:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-22 20:26:43 (GMT)
commit4762c7b42a1fe701670b4564300abc6c13c4ec00 (patch)
treeed8f38b976fcc9283f6d831774a60519aa57cd57
parent63296d583ca107b3f590c3a09be9b3670a2c1afb (diff)
parentbba5fccc03a936982d1ee388f2c957c4d239e504 (diff)
downloadgit-4762c7b42a1fe701670b4564300abc6c13c4ec00.zip
git-4762c7b42a1fe701670b4564300abc6c13c4ec00.tar.gz
git-4762c7b42a1fe701670b4564300abc6c13c4ec00.tar.bz2
Merge branch 'js/t5000-dont-copy-bin-sh'
* js/t5000-dont-copy-bin-sh: t5000 on Windows: do not mistake "sh.exe" as "sh"
-rwxr-xr-xt/t5000-tar-tree.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index d01bbdc..4b68bba 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -101,7 +101,7 @@ test_expect_success \
ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
echo long filename >a/four$hundred &&
mkdir a/bin &&
- cp /bin/sh a/bin &&
+ test-genrandom "frotz" 500000 >a/bin/sh &&
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
printf "A not substituted O" >a/substfile2 &&
if test_have_prereq SYMLINKS; then