diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-11-08 18:03:04 +0100 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2016-11-08 15:29:24 -0500 |
| commit | 734fde2d7167e4b20d2ff6062ade3846949b0741 (patch) | |
| tree | 074ff9fce2f8949b146f89e5ea895033513e3c7a | |
| parent | 5babb5bdb3d09ee670f7e3a3ae596eb2f1d02268 (diff) | |
| download | git-734fde2d7167e4b20d2ff6062ade3846949b0741.tar.gz | |
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>
| -rwxr-xr-x | t/t6026-merge-attr.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" && |