projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adf60f1
)
t7502: honor SHELL_PATH
author
Junio C Hamano
<gitster@pobox.com>
Wed, 4 Jun 2008 19:10:01 +0000
(12:10 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 4 Jun 2008 19:11:59 +0000
(12:11 -0700)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7502-commit.sh
patch
|
blob
|
history
diff --git
a/t/t7502-commit.sh
b/t/t7502-commit.sh
index a5801df8b68f654a0a8fa972b3fc0acc75fe071d..ed871a6b4d7963f520b994f4d378b02194d69f9e 100755
(executable)
--- a/
t/t7502-commit.sh
+++ b/
t/t7502-commit.sh
@@
-217,14
+217,14
@@
test_expect_success 'do not fire editor in the presence of conflicts' '
'
pwd=`pwd`
-cat >
.git/FAKE_EDITOR <<
EOF
-#!
/bin/sh
+cat >
.git/FAKE_EDITOR <<
EOF
+#!
$SHELL_PATH
# kill -TERM command added below.
EOF
test_expect_success 'a SIGTERM should break locks' '
echo >>negative &&
-
sh
-c '\''
+
"$SHELL_PATH"
-c '\''
echo kill -TERM $$ >> .git/FAKE_EDITOR
GIT_EDITOR=.git/FAKE_EDITOR exec git commit -a'\'' && exit 1 # should fail
! test -f .git/index.lock