From: Eric Sunshine <sunshine@sunshineco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Ramsay Jones <ramsay@ramsay1.demon.co.uk>,
GIT Mailing-list <git@vger.kernel.org>
Subject: Re: [PATCH 11/14] t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
Date: Tue, 14 Dec 2010 18:32:33 -0500 [thread overview]
Message-ID: <4D07FE91.2090003@sunshineco.com> (raw)
In-Reply-To: <7vtyigtaxn.fsf@alter.siamese.dyndns.org>
On 12/14/2010 2:24 PM, Junio C Hamano wrote:
> 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?
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
next prev parent reply other threads:[~2010-12-14 23:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-14 18:34 [PATCH 11/14] t3032-*.sh: Pass the -b (--binary) option to sed on cygwin Ramsay Jones
2010-12-14 19:24 ` Junio C Hamano
2010-12-14 23:32 ` Eric Sunshine [this message]
2010-12-15 8:22 ` Johannes Sixt
2010-12-15 9:30 ` Eric Sunshine
2010-12-16 21:19 ` Ramsay Jones
2010-12-17 7:34 ` Johannes Sixt
2010-12-18 20:16 ` Ramsay Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D07FE91.2090003@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ramsay@ramsay1.demon.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).