From: Mark Levedahl <mlevedahl@gmail•com>
To: Ramsay Jones <ramsay@ramsay1•demon.co.uk>
Cc: Jonathan Nieder <jrnieder@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending
Date: Thu, 18 Jul 2013 17:47:10 -0400 [thread overview]
Message-ID: <51E8625E.6020808@gmail.com> (raw)
In-Reply-To: <51E83FA7.5080706@ramsay1.demon.co.uk>
On 07/18/2013 03:19 PM, Ramsay Jones wrote:
> Jonathan Nieder wrote:
>> Mark Levedahl wrote:
>>
>>> Subtests 6, 7, and 9 rely test that merge-recursive correctly
>>> ignores whitespace when so directed. Change the particular whitespace
>>> sequences to be ones that are not known line endings so the whitespace
>>> is not changed when being extracted by line oriented grep.
>> merge-recursive needs to be able to deal with \r at EOL, too, so if at
>> all possible I would prefer to see the test fixed to pass on Cygwin
>> some other way.
> Maybe use -U/--binary option to grep? Indeed, if you look at the top of
> that test file, you will see:
>
> test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
> test_have_prereq MINGW && export GREP_OPTIONS=-U
>
> which may explain why it works for me on MinGW, but not why it works on
> cygwin 1.5.
>
> ATB,
> Ramsay Jones
>
>
>
>
>
Thanks, hadn't noticed that, it leads to a much better patch.
Mark
next prev parent reply other threads:[~2013-07-18 21:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-16 18:33 t3032 incompatible with Cygwin/Windows Mark Levedahl
2013-07-16 18:49 ` [PATCH] t3032 - make compatible with systems using \r\n as a line ending Mark Levedahl
2013-07-16 18:59 ` Jonathan Nieder
2013-07-16 19:44 ` Mark Levedahl
2013-07-16 20:26 ` Mark Levedahl
2013-07-16 20:32 ` Mark Levedahl
2013-07-17 19:33 ` Junio C Hamano
2013-07-18 21:44 ` [PATCH] test-lib.sh - define and use GREP_STRIPS_CR Mark Levedahl
2013-07-20 19:41 ` Ramsay Jones
2013-07-21 21:04 ` Junio C Hamano
2013-07-18 19:19 ` [PATCH] t3032 - make compatible with systems using \r\n as a line ending Ramsay Jones
2013-07-18 21:47 ` Mark Levedahl [this message]
2013-07-16 18:56 ` t3032 incompatible with Cygwin/Windows Jonathan Nieder
2013-07-18 19:11 ` 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=51E8625E.6020808@gmail.com \
--to=mlevedahl@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=ramsay@ramsay1$(echo .)demon.co.uk \
/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