merge hook tests: use 'test_must_fail' instead of '!'
authorBenoit Pierre <benoit.pierre@gmail.com>
Mon, 10 Mar 2014 18:49:32 +0000 (19:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2014 20:57:43 +0000 (13:57 -0700)
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7505-prepare-commit-msg-hook.sh
index 1c95652dce4a616a4dd142511617559ca62e80f5..5531abb0c4ed471d139168ffc3132d2d5b52350a 100755 (executable)
@@ -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
 
 '