t7502-commit.sh: rearrange test to make more portable
Some shells have problems with one-shot environment variable export and function calls. The sequence is rearranged to avoid the one-shot and to allow the test script to be linked together with '&&'. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
03b9dfb18b
commit
09b78bc1fc
@ -228,10 +228,12 @@ EOF
|
|||||||
|
|
||||||
test_expect_success 'a SIGTERM should break locks' '
|
test_expect_success '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
|
||||||
GIT_EDITOR=.git/FAKE_EDITOR exec git commit -a'\'' && exit 1 # should fail
|
GIT_EDITOR=.git/FAKE_EDITOR
|
||||||
! test -f .git/index.lock
|
export GIT_EDITOR
|
||||||
|
exec git commit -a'\'' &&
|
||||||
|
test ! -f .git/index.lock
|
||||||
'
|
'
|
||||||
|
|
||||||
rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG
|
rm -f .git/MERGE_MSG .git/COMMIT_EDITMSG
|
||||||
|
Loading…
Reference in New Issue
Block a user