Revert "t6026-merge-attr: don't fail if sleep exits early"
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 23:55:13 +0000 (15:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Nov 2016 23:55:13 +0000 (15:55 -0800)
This reverts commit 734fde2d7167e4b20d2ff6062ade3846949b0741.

The point of the test is that the stray process was still running
when 'git merge' did its thing through its completion, so a failure
to "kill" it means we didn't give a condition to the test to trigger
a possible future breakage. Appending "|| :" to the "kill" is
sweeping a test-bug under the rug.

t/t6026-merge-attr.sh
index 2672b15aa3d0df9ad45027bbc91c1c66b4b5c199..7a6e33e6732eaf69e298b56729ba4ead9ffaee0e 100755 (executable)
@@ -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" &&