From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Mar 2009 22:08:09 +0000 (-0700)
Subject: Merge branch 'for-junio' of git://repo.or.cz/git/mingw/j6t
X-Git-Tag: v1.6.3-rc0~93
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8befac5d6f9e994d72efb1ecc59c356414114e7e?hp=-c

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
---

8befac5d6f9e994d72efb1ecc59c356414114e7e
diff --combined t/test-lib.sh
index 8de5ee1b58,572301df1b..2979e8ea0e
--- a/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