mirror of
https://github.com/git/git.git
synced 2024-10-19 21:08:12 +02:00
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>
This commit is contained in:
parent
5f95c9f850
commit
3219bad944
@ -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 - &&
|
||||
|
Loading…
Reference in New Issue
Block a user