diff options
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | 2010-12-14 18:35:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-09 07:36:37 (GMT) |
| commit | a28adc2d79bdcc7c780dbe135969af1f914601a9 (patch) | |
| tree | cd9fc12625d5a4d751bc79c3ed1ee45326eb7377 /t | |
| parent | 906a9a7d1d86b9002813a531ab62f436e798b66b (diff) | |
| download | git-a28adc2d79bdcc7c780dbe135969af1f914601a9.zip git-a28adc2d79bdcc7c780dbe135969af1f914601a9.tar.gz git-a28adc2d79bdcc7c780dbe135969af1f914601a9.tar.bz2 | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | 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 () { |