mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t6026-merge-attr: don't fail if sleep exits early
Commit 5babb5bdb3
("t6026-merge-attr: clean up background process at end
of test case") added a kill command to clean up after the test, but this
can fail if the sleep command exits before the cleanup is executed.
Ignore the error from the kill command.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
parent
5babb5bdb3
commit
734fde2d71
|
@ -187,7 +187,7 @@ test_expect_success 'custom merge does not lock index' '
|
|||
sleep 1 &
|
||||
echo $! >sleep.pid
|
||||
EOF
|
||||
test_when_finished "kill \$(cat sleep.pid)" &&
|
||||
test_when_finished "kill \$(cat sleep.pid) || :" &&
|
||||
|
||||
test_write_lines >.gitattributes \
|
||||
"* merge=ours" "text merge=sleep-one-second" &&
|
||||
|
|
Loading…
Reference in a new issue