aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Pierre <benoit.pierre@gmail.com>2014-03-10 19:49:32 +0100
committerJunio C Hamano <gitster@pobox.com>2014-03-11 13:57:43 -0700
commitb7ae14148fc44223b4ffaff5ccbf3227a0af8f3c (patch)
treede7a8825f116330189823c272ace4d40555bbdf9
parent3219bad94422084184987c9660361f3245d69f04 (diff)
downloadgit-b7ae14148fc44223b4ffaff5ccbf3227a0af8f3c.tar.gz
git-b7ae14148fc44223b4ffaff5ccbf3227a0af8f3c.tar.xz
merge hook tests: use 'test_must_fail' instead of '!'
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7505-prepare-commit-msg-hook.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 1c95652dc..5531abb0c 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -154,7 +154,7 @@ test_expect_success 'with failing hook' '
head=`git rev-parse HEAD` &&
echo "more" >> file &&
git add file &&
- ! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
+ test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit -c $head
'
@@ -163,7 +163,7 @@ test_expect_success 'with failing hook (--no-verify)' '
head=`git rev-parse HEAD` &&
echo "more" >> file &&
git add file &&
- ! GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
+ test_must_fail env GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify -c $head
'