From: Ramsay Jones <ramsay@ramsay1•demon.co.uk>
To: Eric Sunshine <sunshine@sunshineco•com>
Cc: Johannes Sixt <j.sixt@viscovery•net>,
Junio C Hamano <gitster@pobox•com>,
GIT Mailing-list <git@vger•kernel.org>,
Pat Thoyts <patthoyts@gmail•com>
Subject: Re: [PATCH 11/14] t3032-*.sh: Pass the -b (--binary) option to sed on cygwin
Date: Thu, 16 Dec 2010 21:19:12 +0000 [thread overview]
Message-ID: <4D0A8250.5090403@ramsay1.demon.co.uk> (raw)
In-Reply-To: <4D088AB6.5090501@sunshineco.com>
Eric Sunshine wrote:
> On 12/15/2010 3:22 AM, Johannes Sixt wrote:
>> Am 12/15/2010 0:32, schrieb Eric Sunshine:
>>> 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.
>> Sorry, but on MinGW, I only need the GREP_OPTIONS part of that fix, but
>> not the SED_OPTIONS. It's also mysterious for me.
>>
>> OTOH, the fix in ca02ad3 that applies to t6038, does not work for me as is
>> because my sed does not understand -b; it needs --nocr. Maybe it is the
>> sed version that makes the difference?
>>
>> D:\Src\mingw-git\t>sed --version
>> GNU sed version 3.02
>
> Failure of t3032 was reported by Pat Thoyts [1] when preparing for the
> v1.7.3 release. The problem was diagnosed and patched via [2] under the
> standard msysgit netinstall [3] environment. From commit message [2],
> GREP_OPTIONS and SED_OPTIONS were applied to resolve distinct cases of
> line-terminator "corruption" (t3032.4-t3032.8 and t3032.9, respectively)
> within that environment at the time the patch was prepared.
>
> Your tool versions may indeed not be compatible with those of the
> netinstall environment [3]:
>
> $ sed --version
> GNU sed version 4.2.1
>
> Unfortunately, the old --nocr is not recognized by modern GNU sed:
>
> $ sed --nocr
> sed: unrecognized option `--nocr'
Yes. Like Johannes, I have sed version 3.02 on MinGW, but on cygwin
I have sed version 4.1.5. See patch #14, where I introduce the
SED_BIN_OPT variable to allow me to run the tests with SED_OPTIONS
set to -c instead of -b.
[I thought I was unusual in having such an old sed version, but
apparently not... ;-) ]
ATB,
Ramsay Jones
next prev parent reply other threads:[~2010-12-16 22:41 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
2010-12-15 8:22 ` Johannes Sixt
2010-12-15 9:30 ` Eric Sunshine
2010-12-16 21:19 ` Ramsay Jones [this message]
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=4D0A8250.5090403@ramsay1.demon.co.uk \
--to=ramsay@ramsay1$(echo .)demon.co.uk \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=j.sixt@viscovery$(echo .)net \
--cc=patthoyts@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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