mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-26 03:14:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW

Browse Source 
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>
This commit is contained in:
Ramsay Jones 2010-12-14 18:35:48 +00:00 committed by Junio C Hamano
parent 906a9a7d1d
commit a28adc2d79
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/t3032-merge-recursive-options.sh
View File

@ -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 () {