Re: t6023 broken under Mac OS

2016-01-02 Thread Junio C Hamano
Ramsay Jones writes: > Hmm, I have never used a Mac, so I'm just guessing here, but > you could try something like (obviously untested!): > > diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh > index 245359a..68b306f 100755 > --- a/t/t6023-merge-file.sh >

Re: t6023 broken under Mac OS

2016-01-02 Thread Beat Bolli
On 02.01.16 20:35, Junio C Hamano wrote: > Ramsay Jones writes: > >> Hmm, I have never used a Mac, so I'm just guessing here, but >> you could try something like (obviously untested!): >> >> diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh >> index

Re: t6023 broken under Mac OS

2016-01-01 Thread Ramsay Jones
On 01/01/16 17:49, Torsten Bögershausen wrote: > On 2016-01-01 18.14, Ramsay Jones wrote: >> Hi Torsten, >> >> On 01/01/16 15:36, Torsten Bögershausen wrote: >>> The (last) test case >>> 'conflict markers contain CRLF when core.eol=crlf' >>> >>> does not work as expected under Mac OS: "wc -l" is

Re: t6023 broken under Mac OS

2016-01-01 Thread Torsten Bögershausen
On 2016-01-01 22.14, Ramsay Jones wrote: > > > On 01/01/16 17:49, Torsten Bögershausen wrote: >> On 2016-01-01 18.14, Ramsay Jones wrote: >>> Hi Torsten, >>> >>> On 01/01/16 15:36, Torsten Bögershausen wrote: The (last) test case 'conflict markers contain CRLF when core.eol=crlf'

t6023 broken under Mac OS

2016-01-01 Thread Torsten Bögershausen
The (last) test case 'conflict markers contain CRLF when core.eol=crlf' does not work as expected under Mac OS: "wc -l" is not portable and the line test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3 fails. (The other problem is that the usage of "\r" in a sed expression is not portable

Re: t6023 broken under Mac OS

2016-01-01 Thread Ramsay Jones
Hi Torsten, On 01/01/16 15:36, Torsten Bögershausen wrote: > The (last) test case > 'conflict markers contain CRLF when core.eol=crlf' > > does not work as expected under Mac OS: "wc -l" is not portable and the line > test $(sed -n "/\.txt\r$/p" output.txt | wc -l) = 3 > fails. Hmm, I have

Re: t6023 broken under Mac OS

2016-01-01 Thread Torsten Bögershausen
On 2016-01-01 18.14, Ramsay Jones wrote: > Hi Torsten, > > On 01/01/16 15:36, Torsten Bögershausen wrote: >> The (last) test case >> 'conflict markers contain CRLF when core.eol=crlf' >> >> does not work as expected under Mac OS: "wc -l" is not portable and the line >> test $(sed -n "/\.txt\r$/p"