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: [PATCH v1] Fix t3400 on a case insensitive file system

2016-01-02 Thread Junio C Hamano
Torsten Bögershausen writes: > On a case insenstive file system x is the same as X. > When a file named "X" exist, e.g. ">x && git add x" does not work as expected, > use file name "Y" instead. > > Signed-off-by: Torsten Bögershausen > --- It is a right thing to

Re: [GIT PULL] German l10n updates on Git 2.7.0

2016-01-02 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 03/16] refs: add methods for the ref iterators

2016-01-02 Thread David Aguilar
Apologies for the late review, and this review should probably go on patch 01 or 02 but I don't have it in my mbox atm... On Wed, Dec 02, 2015 at 07:35:08PM -0500, David Turner wrote: > From: Ronnie Sahlberg > > Signed-off-by: Ronnie Sahlberg >

Re: Combining APPLE_COMMON_CRYPTO=1 and NO_OPENSSL=1 produces unexpected result

2016-01-02 Thread David Aguilar
On Sun, Dec 27, 2015 at 06:29:29PM -0800, Junio C Hamano wrote: > Eric Sunshine writes: > > > So, it might be easier to think of NO_OPENSSL as really meaning NO_SSL > > (that is, "disable all SSL-related functionality"). Since the only SSL > > implementation Git knows