difftool-builtin fixes, was Re: What's cooking in git.git (Mar 2017, #08; Mon, 20)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 22, 2017, 16:25 UTC
- Message-ID
- <alpine.DEB.2.20.1703221724500.3767@virtualbox>
- In-Reply-To
- <xmqqefxrtvqa.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Mon, 20 Mar 2017, Junio C Hamano wrote:
Show 9 quoted lines
> * 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.
Ciao, Johannes