From a28adc2d79bdcc7c780dbe135969af1f914601a9 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 14 Dec 2010 18:35:48 +0000 Subject: [PATCH] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW 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 Acked-by: Johannes Sixt Signed-off-by: Junio C Hamano --- t/t3032-merge-recursive-options.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index f70f6c4da4..29e049af55 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 () {