From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:26:43 +0000 (-0800)
Subject: Merge branch 'js/t5000-dont-copy-bin-sh'
X-Git-Tag: v2.3.0-rc0~73
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4762c7b42a1fe701670b4564300abc6c13c4ec00?hp=-c

Merge branch 'js/t5000-dont-copy-bin-sh'

* js/t5000-dont-copy-bin-sh:
t5000 on Windows: do not mistake "sh.exe" as "sh"
---

4762c7b42a1fe701670b4564300abc6c13c4ec00
diff --combined t/t5000-tar-tree.sh
index d01bbdc968,a1d902de1f..4b68bbafbe
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@@ -101,7 -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
@@@ -305,18 -305,4 +305,18 @@@ test_expect_success GZIP 'remote tar.g
  		>remote.tar.gz
  '
  
 +test_expect_success 'archive and :(glob)' '
 +	git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
 +	cat >expect <<EOF &&
 +a/
 +a/bin/
 +a/bin/sh
 +EOF
 +	test_cmp expect actual
 +'
 +
 +test_expect_success 'catch non-matching pathspec' '
 +	test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
 +'
 +
  test_done