Code

t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>
Tue, 14 Dec 2010 18:34:29 +0000 (18:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Jan 2011 07:36:37 +0000 (23:36 -0800)
commit906a9a7d1d86b9002813a531ab62f436e798b66b
treecae0b11b30a3a23cccfa3ca954ca765bd5c33262
parenta31d066524e55351b385e34f9494f36e9f960a6c
t3032-*.sh: Pass the -b (--binary) option to sed on cygwin

The test using the conflict_hunks helper function (test 9) fails
on cygwin, since sed (by default) throws away the CR from CRLF
line endings. This behaviour is undesirable, since the validation
code expects the CRLF line-ending to be present. In order to fix
the problem we pass the -b (--binary) option to sed, using the
SED_OPTIONS variable. We use the SED_STRIPS_CR prerequisite in the
conditional initialisation of SED_OPTIONS.

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