Revert "t6026-merge-attr: don't fail if sleep exits early"
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.
Junio C Hamano committed
Nov 10, 2016 at 15:55 UTC
b36b716cf611dea0054afef55241c88b99399571
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" &&