From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Mar 2017 17:24:11 GMT
Subject: Re: difftool-builtin fixes, was Re: What's cooking in git.git (Mar 2017, #08; Mon, 20)
Message-ID: <xmqqefxpmdhg.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.DEB.2.20.1703221724500.3767@virtualbox>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Mon, 20 Mar 2017, Junio C Hamano wrote:
>
>> * js/difftool-builtin (2017-03-15) 3 commits
>>   (merged to 'next' on 2017-03-16 at 3fccb60a07)
>>  + difftool: handle modified symlinks in dir-diff mode
>>  + t7800: cleanup cruft left behind by tests
>>  + t7800: remove whitespace before redirect
>> 
>>  "git difftool --dir-diff" used to die a controlled death giving a
>>  "fatal" message when encountering a locally modified symbolic link,
>>  but it started segfaulting since v2.12.  This has been fixed.
>
> David fixed much more than the segfault. He fixed the underlying problem,
> i.e. *also* the "fatal" message.

Yes.  By "this" I meant all the issues described in the previous
sentence.

David, thanks again for the fix.