From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Dec 2010 19:24:20 GMT
Subject: Re: [PATCH 11/14] t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
Message-ID: <7vtyigtaxn.fsf@alter.siamese.dyndns.org>
In-Reply-To: <4D07B8B5.2030409@ramsay1.demon.co.uk>

Ramsay Jones <ramsay@ramsay1.demon.co.uk> writes:

> 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>
> ---
>
> Note that this test does not fail on MinGW, but I don't
> really know why, given commit ca02ad3... ahem ;-)

Ahem, indeed.  Why?