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 --combined t/test-lib.sh
index 8de5ee1b580b3f1354428f44c3389239ce0b0894,572301df1bb234f28bcc3d9b3f4484018a72506d..2979e8ea0e85c86a57d9f0dda8915d3b031478de
--- 1/t/test-lib.sh
--- 2/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -491,7 -491,7 +491,7 @@@ test_create_repo () 
        repo="$1"
        mkdir -p "$repo"
        cd "$repo" || error "Cannot setup test environment"
 -      "$GIT_EXEC_PATH/git" init "--template=$owd/../templates/blt/" >&3 2>&4 ||
 +      "$GIT_EXEC_PATH/git-init" "--template=$owd/../templates/blt/" >&3 2>&4 ||
        error "cannot run git init -- have you built things yet?"
        mv .git/hooks .git/hooks-disabled
        cd "$owd"
@@@ -551,16 -551,8 +551,16 @@@ test_done () 
  TEST_DIRECTORY=$(pwd)
  if test -z "$valgrind"
  then
 -      PATH=$TEST_DIRECTORY/..:$PATH
 -      GIT_EXEC_PATH=$TEST_DIRECTORY/..
 +      if test -z "$GIT_TEST_INSTALLED"
 +      then
 +              PATH=$TEST_DIRECTORY/..:$PATH
 +              GIT_EXEC_PATH=$TEST_DIRECTORY/..
 +      else
 +              GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path)  ||
 +              error "Cannot run git from $GIT_TEST_INSTALLED."
 +              PATH=$GIT_TEST_INSTALLED:$TEST_DIRECTORY/..:$PATH
 +              GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
 +      fi
  else
        make_symlink () {
                test -h "$2" &&
@@@ -697,10 -689,12 +697,12 @@@ case $(uname -s) i
        }
        # 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