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 <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Dec 14, 2010 at 18:35 UTC
a28adc2d79bdcc7c780dbe135969af1f914601a9
1 file changed
+1
t/t3032-merge-recursive-options.sh
+1
@@ -14,6 +14,7 @@ test_description='merge-recursive options
14
. ./test-lib.sh
15
16
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
17
+test_have_prereq MINGW && export GREP_OPTIONS=-U
18
19
test_expect_success 'setup' '
20
conflict_hunks () {