Merge branch 'mg/mingw-test-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:29 +0000 (10:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 17 Feb 2016 18:13:29 +0000 (10:13 -0800)
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

1  2 
t/t9100-git-svn-basic.sh
diff --combined t/t9100-git-svn-basic.sh
index 56acc1e70eea8498ba1e5546a6f3cb6126a135b1,936913cd24f65a639e8f593fb4869ea926aa1bbf..22d8367ff397fc68683ff1084ce4914cfbfa9d89
@@@ -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' '