diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2016-02-07 20:11:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-08 14:52:36 -0800 |
| commit | 2605e959f89c24b4ffd860b7d0af8944babd7a3f (patch) | |
| tree | 71a99df13ff24fb0ceca0a99bacad2867b564542 | |
| parent | 80ce6c25a4289835e197004a54ca75401bea55dc (diff) | |
| download | git-mg/mingw-test-fix.tar.gz | |
t9100: fix breakage when SHELL_PATH is not /bin/shmg/mingw-test-fix
bcb11f1 (mingw: mark t9100's test cases with appropriate prereqs, 2016-01-27)
replaced "/bin/sh" in exec.sh by the shell specified in SHELL_PATH, but
that breaks the subtest which checks for a specific checksum of a tree
containing.
Revert that change that was not explained in the commit message anyways
(exec.sh is never executed).
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 5464b5bd14..936913cd24 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 && |