Re: [PATCH 2/2] merge-file: consider core.crlf when writing merge markers

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jan 24, 2016, 18:26 UTC
Message-ID: <CAPig+cT4gQi=OhYT3AwKA=_UER4nC-wOu93U72QcSWtMoVxhMg@mail.gmail.com>
In-Reply-To: <alpine.DEB.2.20.1601241137260.2964@virtualbox>

On Sun, Jan 24, 2016 at 5:37 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

Show 16 quoted lines

> On Fri, 22 Jan 2016, Eric Sunshine wrote:
>> On Fri, Jan 22, 2016 at 2:50 PM, Eric Sunshine <sunshine@sunshineco.com> wrote:
>> > On Fri, Jan 22, 2016 at 06:01:25PM +0100, Johannes Schindelin wrote:
>> >> +test_expect_success 'conflict markers contain CRLF when core.eol=crlf' '
>> >> +     test_must_fail git -c core.eol=crlf merge-file -p \
>> >> +             nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
>> >> +     test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3
>> >
>> > The "\r" isn't recognized by 'sed' on Mac OS X or BSD. Perhaps use
>> > instead:
>> >
>> >     test $(cat output.txt | tr "\015" Q | sed -n "/\.txtQ$/p" | wc -l) = 3
>>
>> Or the 'sed' could even become at 'grep' at this point.
>
> Good point, thanks!

And, without the unnecessary 'cat', of course (don't know what I was thinking):

    test $(tr "\015" Q <output.txt | grep "\.txtQ$" | wc -l) = 3