From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: difftool-builtin fixes, was Re: What's cooking in git.git (Mar 2017, #08; Mon, 20)
Date: Wed, 22 Mar 2017 17:25:40 +0100 (CET)
Message-ID: <alpine.DEB.2.20.1703221724500.3767@virtualbox> (raw)
In-Reply-To: <xmqqefxrtvqa.fsf@gitster.mtv.corp.google.com>
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.
Ciao,
Johannes
next prev parent reply index
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-20 22:43 Junio C Hamano
2017-03-22 16:25 ` Johannes Schindelin [this message]
2017-03-22 17:24 ` difftool-builtin fixes, was " Junio C Hamano
Reply instructions:
You may reply publically to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1703221724500.3767@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many)
Archives are clonable:
git clone --mirror https://public-inbox.org/git
git clone --mirror http://ou63pmih66umazou.onion/git
git clone --mirror http://czquwvybam4bgbro.onion/git
git clone --mirror http://hjrcffqmbrq6wope.onion/git
Newsgroups are available over NNTP:
nntp://news.public-inbox.org/inbox.comp.version-control.git
nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
nntp://news.gmane.org/gmane.comp.version-control.git
note: .onion URLs require Tor: https://www.torproject.org/
AGPL code for this site: git clone https://public-inbox.org/ public-inbox