summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-04 19:10:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-06-04 19:11:59 (GMT)
commitde5825cc829a5d535de726eb7e5af45c0a3b88ce (patch)
treef7d5c49156b0d8b9ae5ac0833b528164aa720d06
parentadf60f1440aa166615711f5c2ae262db79ba6eb2 (diff)
downloadgit-de5825cc829a5d535de726eb7e5af45c0a3b88ce.zip
git-de5825cc829a5d535de726eb7e5af45c0a3b88ce.tar.gz
git-de5825cc829a5d535de726eb7e5af45c0a3b88ce.tar.bz2
t7502: honor SHELL_PATH
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7502-commit.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index a5801df..ed871a6 100755
--- 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