| commit | a28adc2d79bdcc7c780dbe135969af1f914601a9 | |
| author | Ramsay Jones <ramsay@ramsay1.demon.co.uk> | |
| Tue, 14 Dec 2010 18:35:48 +0000 (14 18:35 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 9 Jan 2011 07:36:37 +0000 (8 23:36 -0800) | ||
| tree | cd9fc12625d5a4d751bc79c3ed1ee45326eb7377 | treesnapshot (tar.gz zip) |
| parent | 906a9a7d1d86b9002813a531ab62f436e798b66b | commitdiff |
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>
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>
| t/t3032-merge-recursive-options.sh | diffblobblamehistory |