diff options
| author | Benoit Pierre <benoit.pierre@gmail.com> | 2014-03-10 19:49:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-11 13:57:39 -0700 |
| commit | 3219bad94422084184987c9660361f3245d69f04 (patch) | |
| tree | c2513451f5f32c318f7d0f3ce67196bf34b73beb /t/t7505-prepare-commit-msg-hook.sh | |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
| download | git-3219bad94422084184987c9660361f3245d69f04.tar.gz | |
merge hook tests: fix missing '&&' in test
Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7505-prepare-commit-msg-hook.sh')
| -rwxr-xr-x | t/t7505-prepare-commit-msg-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh index 357375151d..1c95652dce 100755 --- 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 - && |