{"thread":{"id":"14212","subject":"[PATCH] Fix t4017-diff-retval for white-space from wc","startedAt":"2008-06-29T20:49:06Z","lastAt":"2008-06-29T20:49:06Z","messageCount":1,"participants":["Brian Gernhardt"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"81672","messageId":"20080629204906.GB40329@Hermes.local","threadId":"14212","inReplyTo":null,"subject":"[PATCH] Fix t4017-diff-retval for white-space from wc","fromName":"Brian Gernhardt","fromEmail":"benji@silverinsanity.com","sentAt":"2008-06-29T20:49:06Z","receivedAt":"2008-06-29T20:49:06Z","isPatch":true,"sender":{"key":"benji@silverinsanity.com","avatar":"https://gravatar.com/avatar/e06c101dbc25c68114d859b4a9ec7cf8a2c52fd2b0270ef0eac0e2e63ff22311?d=mp&s=160"},"body":"Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>\n---\n t/t4017-diff-retval.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\n \tAlso: we have t4017-diff-retval and t4017-quiet.  Should one of\n \tthese be renamed?\n\ndiff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh\nindex d748d45..60dd201 100755\n--- a/t/t4017-diff-retval.sh\n+++ b/t/t4017-diff-retval.sh\n@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '\n \t\tgit --no-pager diff --cached --check >test.out\n \t\ttest $? = 2\n \t) &&\n-\ttest \"$(grep \"conflict marker\" test.out | wc -l)\" = 3 &&\n+\ttest 3 = $(grep \"conflict marker\" test.out | wc -l) &&\n \tgit reset --hard\n '\n \n-- \n1.5.6.105.g6f4b\n"}]}