From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Thu, 18 Jul 2013 19:19:03 GMT
Subject: Re: [PATCH] t3032 - make compatible with systems using \r\n as a line ending
Message-ID: <51E83FA7.5080706@ramsay1.demon.co.uk>
In-Reply-To: <20130716185933.GO14690@google.com>

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