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>
Andreas Schwab committed
Nov 8, 2016 at 18:03 UTC
734fde2d7167e4b20d2ff6062ade3846949b0741
1 file changed
+1
-1
t/t6026-merge-attr.sh
+1
-1
@@ -187,7 +187,7 @@ test_expect_success 'custom merge does not lock index' '
187
sleep 1 &
188
echo $! >sleep.pid
189
EOF
190
- test_when_finished "kill \$(cat sleep.pid)" &&
190
+ test_when_finished "kill \$(cat sleep.pid) || :" &&
191
192
test_write_lines >.gitattributes \
193
"* merge=ours" "text merge=sleep-one-second" &&