Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t

* 'for-junio' of git://repo.or.cz/git/mingw/j6t:
t7502-commit: Skip SIGTERM test on Windows
t7005-editor: Use $SHELL_PATH in the editor scripts

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 2f8404afbbc38e9bed17b1d3c9dde22ddcb2eaa2..e83bc8fd89c35db06f9bd8f0f4861c0b61c11023 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -7,6 +7,7 @@ test_description='GIT_EDITOR, core.editor, and stuff'
 for i in GIT_EDITOR core_editor EDITOR VISUAL vi
 do
        cat >e-$i.sh <<-EOF
+       #!$SHELL_PATH
        echo "Edited by $i" >"\$1"
        EOF
        chmod +x e-$i.sh

diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index ad42c78d7c21497a6ebb4e9cef4efd6334f947da..56cd866019dcc871e5dea684f1d879fcf2c1b884 100755 (executable)
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -234,7 +234,7 @@ cat >.git/FAKE_EDITOR <<EOF
 # kill -TERM command added below.
 EOF
 
-test_expect_success 'a SIGTERM should break locks' '
+test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
        echo >>negative &&
        ! "$SHELL_PATH" -c '\''
          echo kill -TERM $$ >> .git/FAKE_EDITOR

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8de5ee1b580b3f1354428f44c3389239ce0b0894..2979e8ea0e85c86a57d9f0dda8915d3b031478de 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -697,10 +697,12 @@ case $(uname -s) in
        }
        # no POSIX permissions
        # backslashes in pathspec are converted to '/'
+       # exec does not inherit the PID
        ;;
 *)
        test_set_prereq POSIXPERM
        test_set_prereq BSLASHPSPEC
+       test_set_prereq EXECKEEPSPID
        ;;
 esac