mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Junio C Hamano
2009-03-25 15:08:09 -07:00
parent 5c928c06e2 fb9a2beab2
commit 8befac5d6f
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
t/t7005-editor.sh
View File

@ -7,6 +7,7 @@ test_description='GIT_EDITOR, core.editor, and stuff'
for i in GIT_EDITOR core_editor EDITOR VISUAL vi for i in GIT_EDITOR core_editor EDITOR VISUAL vi
do do
cat >e-$i.sh <<-EOF cat >e-$i.sh <<-EOF
#!$SHELL_PATH
echo "Edited by $i" >"\$1" echo "Edited by $i" >"\$1"
EOF EOF
chmod +x e-$i.sh chmod +x e-$i.sh

2
t/t7502-commit.sh
View File

@ -234,7 +234,7 @@ cat >.git/FAKE_EDITOR <<EOF
# kill -TERM command added below. # kill -TERM command added below.
EOF EOF
test_expect_success 'a SIGTERM should break locks' ' test_expect_success EXECKEEPSPID 'a SIGTERM should break locks' '
echo >>negative && echo >>negative &&
! "$SHELL_PATH" -c '\'' ! "$SHELL_PATH" -c '\''
echo kill -TERM $$ >> .git/FAKE_EDITOR echo kill -TERM $$ >> .git/FAKE_EDITOR

2
t/test-lib.sh
View File

@ -697,10 +697,12 @@ case $(uname -s) in
} }
# no POSIX permissions # no POSIX permissions
# backslashes in pathspec are converted to '/' # backslashes in pathspec are converted to '/'
# exec does not inherit the PID
;; ;;
*) *)
test_set_prereq POSIXPERM test_set_prereq POSIXPERM
test_set_prereq BSLASHPSPEC test_set_prereq BSLASHPSPEC
test_set_prereq EXECKEEPSPID
;; ;;
esac esac