diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2008-06-29 22:49:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-30 00:11:50 +0200 |
| commit | ab20fda99236e38edf5d63f964b6b920b494aacb (patch) | |
| tree | 4362713ca1fb4f7d98fe950388b6382640f39e4a | |
| parent | Update sample pre-commit hook to use "diff --check" (diff) | |
| download | git-ab20fda99236e38edf5d63f964b6b920b494aacb.tar.xz git-ab20fda99236e38edf5d63f964b6b920b494aacb.zip | |
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>
| -rwxr-xr-x | t/t4017-diff-retval.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh index d748d45dae..60dd2014d5 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 ' |