From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Nov 2016 23:55:13 +0000 (-0800)
Subject: Revert "t6026-merge-attr: don't fail if sleep exits early"
X-Git-Tag: v2.11.0-rc1~7^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b36b716cf611dea0054afef55241c88b99399571;p=thirdparty%2Fgit.git

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.
---

diff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh
index 2672b15aa3..7a6e33e673 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" &&