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

Benabik · gitster · commit ab20fda99236 · 2008-06-29T15:11:50.000-07:00
Signed-off-by: Brian Gernhardt &lt;benji@silverinsanity.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '`
`123`	`123`	`git --no-pager diff --cached --check >test.out`
`124`	`124`	`test $? = 2`
`125`	`125`	`) &&`
`126`		`- test "$(grep "conflict marker" test.out \| wc -l)" = 3 &&`
	`126`	`+ test 3 = $(grep "conflict marker" test.out \| wc -l) &&`
`127`	`127`	`git reset --hard`
`128`	`128`	`'`
`129`	`129`