From: Andreas Schwab Date: Tue, 8 Nov 2016 17:03:04 +0000 (+0100) Subject: t6026-merge-attr: don't fail if sleep exits early X-Git-Tag: v2.11.0-rc1~7^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=734fde2d7167e4b20d2ff6062ade3846949b0741;p=git 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 Signed-off-by: Jeff King --- diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh index 7a6e33e673..2672b15aa3 100755 --- a/t/t6026-merge-attr.sh +++ b/t/t6026-merge-attr.sh @@ -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" &&