aboutsummaryrefslogtreecommitdiff
path: root/t/t4017-diff-retval.sh
diff options
context:
space:
mode:
authorBrian Gernhardt <benji@silverinsanity.com>2008-06-29 16:49:06 -0400
committerJunio C Hamano <gitster@pobox.com>2008-06-29 15:11:50 -0700
commitab20fda99236e38edf5d63f964b6b920b494aacb (patch)
tree4362713ca1fb4f7d98fe950388b6382640f39e4a /t/t4017-diff-retval.sh
parent03e2b630f05b88da5ff43f194fed25755de44e8b (diff)
downloadgit-ab20fda99236e38edf5d63f964b6b920b494aacb.tar.gz
git-ab20fda99236e38edf5d63f964b6b920b494aacb.tar.xz
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>
Diffstat (limited to 't/t4017-diff-retval.sh')
-rwxr-xr-xt/t4017-diff-retval.sh2
1 files changed, 1 insertions, 1 deletions
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
'