From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Feb 2016 18:13:29 +0000 (-0800)
Subject: Merge branch 'mg/mingw-test-fix'
X-Git-Tag: v2.8.0-rc0~53
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f60ccdd98c3f1183922b43478b629049408849ff?hp=-c

Merge branch 'mg/mingw-test-fix'

An earlier adjustment of test mistakenly used write_script
to prepare a file whose exact content matters for the test;
reverting that part fixes the breakage for those who use
SHELL_PATH that is different from /bin/sh.

* mg/mingw-test-fix:
t9100: fix breakage when SHELL_PATH is not /bin/sh
---

f60ccdd98c3f1183922b43478b629049408849ff
diff --combined t/t9100-git-svn-basic.sh
index 56acc1e70e,936913cd24..22d8367ff3
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@@ -30,7 -30,8 +30,8 @@@ test_expect_success 
  		echo "deep dir" >dir/a/b/c/d/e/file &&
  		mkdir bar &&
  		echo "zzz" >bar/zzz &&
- 		write_script exec.sh </dev/null &&
+ 		echo "#!/bin/sh" >exec.sh &&
+ 		chmod +x exec.sh &&
  		svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null
  	) &&
  	rm -rf import &&
@@@ -265,18 -266,18 +266,18 @@@ test_expect_success 'able to dcommit t
  	git update-index --add d &&
  	git commit -m '/bar/d should be in the log' &&
  	git svn dcommit -i bar &&
 -	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
 +	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
  	mkdir newdir &&
  	echo new > newdir/dir &&
  	git update-index --add newdir/dir &&
  	git commit -m 'add a new directory' &&
  	git svn dcommit -i bar &&
 -	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
 +	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\" &&
  	echo foo >> newdir/dir &&
  	git update-index newdir/dir &&
  	git commit -m 'modify a file in new directory' &&
  	git svn dcommit -i bar &&
 -	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
 +	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
  	"
  
  test_expect_success 'dcommit should not fail with a touched file' '
@@@ -295,7 -296,7 +296,7 @@@ test_expect_success 'able to set-tree t
  	git update-index d &&
  	git commit -m 'update /bar/d' &&
  	git svn set-tree -i bar HEAD &&
 -	test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
 +	test -z \"\$(git diff refs/heads/my-bar refs/remotes/bar)\"
  	"
  
  test_expect_success 'git-svn works in a bare repository' '