[PATCH 5/6] merge hook tests: fix missing '&&' in test
From: Benoit Pierre <hidden>
Date: 2016-06-15 23:00:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Benoit Pierre <redacted> --- t/t7505-prepare-commit-msg-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index ae7b2db..604c06e 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh@@ -189,7 +189,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 - &&
--
1.9.0