{"thread":{"id":"26066","subject":"[PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW","startedAt":"2010-12-14T18:35:48Z","lastAt":"2010-12-14T19:44:30Z","messageCount":2,"participants":["Ramsay Jones","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":14},"messages":[{"id":"158078","messageId":"4D07B904.8040206@ramsay1.demon.co.uk","threadId":"26066","inReplyTo":null,"subject":"[PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsay1.demon.co.uk","sentAt":"2010-12-14T18:35:48Z","receivedAt":"2010-12-14T18:35:48Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nBy default grep reads in text mode and converts CRLF into LF line\nendings, which causes tests 4, 6 and 8 to fail. In a similar manner\nto commit a94114ad  (Do not strip CR when grepping HTTP headers,\n2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so\nthat grep will use binary mode.\n\nSigned-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n---\n t/t3032-merge-recursive-options.sh |    1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh\nindex f70f6c4..29e049a 100755\n--- a/t/t3032-merge-recursive-options.sh\n+++ b/t/t3032-merge-recursive-options.sh\n@@ -14,6 +14,7 @@ test_description='merge-recursive options\n . ./test-lib.sh\n \n test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b\n+test_have_prereq MINGW && export GREP_OPTIONS=-U\n \n test_expect_success 'setup' '\n \tconflict_hunks () {\n-- \n1.7.3\n"},{"id":"158087","messageId":"7vaak8ta01.fsf@alter.siamese.dyndns.org","threadId":"26066","inReplyTo":"4D07B904.8040206@ramsay1.demon.co.uk","subject":"Re: [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-12-14T19:44:30Z","receivedAt":"2010-12-14T19:44:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:\n\n> By default grep reads in text mode and converts CRLF into LF line\n> endings, which causes tests 4, 6 and 8 to fail. In a similar manner\n> to commit a94114ad  (Do not strip CR when grepping HTTP headers,\n> 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so\n> that grep will use binary mode.\n>\n> Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>\n\nAdding these GNU specific options leaves a bad aftertaste in my mouth, but\nI'd pass them, as their use is limited to certain platforms with \"prereq\".\n\nThanks.\n"}]}