Subject: Re: [PATCH 11/14] t3032-*.sh: Pass the -b (--binary) option to sed on cygwin

From: Eric Sunshine <[email-masked]>
Date: Tue, 14 Dec 2010 18:32:33 -0500

On 12/14/2010 2:24 PM, Junio C Hamano wrote:
> Ramsay Jones<[email-masked]>  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<[email-masked]>
>> ---
>>
>> Note that this test does not fail on MinGW, but I don't
>> really know why, given commit ca02ad3... ahem ;-)
>
> Ahem, indeed.  Why?

t3032 does indeed fail on MinGW, and was fixed in the msysgit port by 
[1], but was subsequently "lost" when msysgit was rebased onto 
junio/next [2] which did not have that test. Consequently, the fix never 
made it into the mainline git source.

[1]: 
http://groups.google.com/group/msysgit/browse_thread/thread/587d32ee034b0cbe/dca93dc6ad755012#dca93dc6ad755012
[2]: 
http://groups.google.com/group/msysgit/browse_thread/thread/d522ec5c13a3af0b/718eaedffc042fb5#718eaedffc042fb5

-- ES