# [PATCH] Fix t4017-diff-retval for white-space from wc 2 messages from 2008-06-30 to 2008-06-30. Participants: Brian Gernhardt. Thread: https://gitlist.dev/t/14216 ## Brian Gernhardt, 2008-06-30 01:26 Subject: [PATCH] Fix t4017-diff-retval for white-space from wc Message-ID: <1214789205-43490-1-git-send-email-benji@silverinsanity.com> URL: https://gitlist.dev/e/1214789205-43490-1-git-send-email-benji%40silverinsanity.com ``` Signed-off-by: Brian Gernhardt --- 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 d748d45..60dd201 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 ' -- 1.5.6.105.g6f4b ``` ## Brian Gernhardt, 2008-06-30 01:29 Subject: Re: [PATCH] Fix t4017-diff-retval for white-space from wc Message-ID: <2A25C1B7-2C95-4B9F-AA3A-3FFB653ADBBE@silverinsanity.com> URL: https://gitlist.dev/e/2A25C1B7-2C95-4B9F-AA3A-3FFB653ADBBE%40silverinsanity.com In-Reply-To: <1214789205-43490-1-git-send-email-benji@silverinsanity.com> ``` Sorry about duplicate. Forgot to remove sendemail.to when testing git- send-email. (Finally tracked down my problems to a bug in Term::ReadLine::Perl when the prompt was longer than the terminal width.) ~~ Brian On Jun 29, 2008, at 9:26 PM, Brian Gernhardt wrote: > Signed-off-by: Brian Gernhardt > --- > 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 d748d45..60dd201 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 > ' > > -- > 1.5.6.105.g6f4b > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ```