# [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW 2 messages from 2010-12-14 to 2010-12-14. Participants: Ramsay Jones, Junio C Hamano. Thread: https://gitlist.dev/t/26066 ## Ramsay Jones, 2010-12-14 18:35 Subject: [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW Message-ID: <4D07B904.8040206@ramsay1.demon.co.uk> URL: https://gitlist.dev/e/4D07B904.8040206%40ramsay1.demon.co.uk ``` By default grep reads in text mode and converts CRLF into LF line endings, which causes tests 4, 6 and 8 to fail. In a similar manner to commit a94114ad (Do not strip CR when grepping HTTP headers, 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so that grep will use binary mode. Signed-off-by: Ramsay Jones --- t/t3032-merge-recursive-options.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index f70f6c4..29e049a 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -14,6 +14,7 @@ test_description='merge-recursive options . ./test-lib.sh test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b +test_have_prereq MINGW && export GREP_OPTIONS=-U test_expect_success 'setup' ' conflict_hunks () { -- 1.7.3 ``` ## Junio C Hamano, 2010-12-14 19:44 Subject: Re: [PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW Message-ID: <7vaak8ta01.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vaak8ta01.fsf%40alter.siamese.dyndns.org In-Reply-To: <4D07B904.8040206@ramsay1.demon.co.uk> ``` Ramsay Jones writes: > By default grep reads in text mode and converts CRLF into LF line > endings, which causes tests 4, 6 and 8 to fail. In a similar manner > to commit a94114ad (Do not strip CR when grepping HTTP headers, > 2010-09-12), we set (and export) the GREP_OPTIONS variable to -U so > that grep will use binary mode. > > Signed-off-by: Ramsay Jones Adding these GNU specific options leaves a bad aftertaste in my mouth, but I'd pass them, as their use is limited to certain platforms with "prereq". Thanks. ```