Skip to content

Commit

Permalink
Merge branch 'mg/mingw-test-fix'
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Feb 17, 2016
2 parents 4b589e5 + 2605e95 commit f60ccdd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion t/t9100-git-svn-basic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +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 &&
Expand Down

0 comments on commit f60ccdd

Please sign in to comment.