[PATCH 12/14] t3032-*.sh: Do not strip CR from line-endings while grepping on MinGW
- From
Ramsay Jones <ramsay@ramsay1.demon.co.uk>
- Date
- Dec 14, 2010, 18:35 UTC
- Message-ID
- <4D07B904.8040206@ramsay1.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 <ramsay@ramsay1.demon.co.uk> --- 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