From: Brian Gernhardt <benji@silverinsanity.com>
Date: Sun, 29 Jun 2008 20:49:06 +0000 (-0400)
Subject: Fix t4017-diff-retval for white-space from wc
X-Git-Tag: v1.6.0-rc0~175^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ab20fda99236e38edf5d63f964b6b920b494aacb;p=git.git

Fix t4017-diff-retval for white-space from wc

Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45da..60dd2014d 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '
 		git --no-pager diff --cached --check >test.out
 		test $? = 2
 	) &&
-	test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+	test 3 = $(grep "conflict marker" test.out | wc -l) &&
 	git reset --hard
 '