Andrew's git / gitweb.git / diff
?
merge hook tests: fix missing '&&' in test
authorBenoit Pierre <benoit.pierre@gmail.com>
Mon, 10 Mar 2014 18:49:31 +0000 (19:49 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Mar 2014 20:57:39 +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 patch | blob | history
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 357375151d79d03d11275875dd10ceea42a3ba47..1c95652dce4a616a4dd142511617559ca62e80f5 100755 (executable)
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -174,7 +174,7 @@ test_expect_success 'with failing hook (merge)' '
        git add file &&
        rm -f "$HOOK" &&
        git commit -m other &&
-       write_script "$HOOK" <<-EOF
+       write_script "$HOOK" <<-EOF &&
        exit 1
        EOF
        git checkout - &&