diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:13:29 -0800 |
commit | f60ccdd98c3f1183922b43478b629049408849ff (patch) | |
tree | 04181bc60c63077d8ee851a4f5e1323c205b1e32 /t/t9100-git-svn-basic.sh | |
parent | 4b589e5b28af077ddbdd5b72b6217c7447d45cb5 (diff) | |
parent | 2605e959f89c24b4ffd860b7d0af8944babd7a3f (diff) | |
download | git-f60ccdd98c3f1183922b43478b629049408849ff.tar.gz |
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
Diffstat (limited to 't/t9100-git-svn-basic.sh')
-rwxr-xr-x | t/t9100-git-svn-basic.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 56acc1e70e..22d8367ff3 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -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 && |