From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Stefan Frühwirth" <stefan.fruehwirth@uni-graz.at>, git@vger.kernel.org
Subject: Re: whither merge-tree?
Date: Tue, 23 Feb 2016 02:18:12 -0500 [thread overview]
Message-ID: <20160223071812.GD8395@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqr3g42atl.fsf@gitster.mtv.corp.google.com>
On Mon, Feb 22, 2016 at 10:35:34PM -0800, Junio C Hamano wrote:
> > I stopped short of dropping the create_virtual_base function in the
> > first patch, for reasons explained there. But if we were to do so, I
> > suspect we could deprecated and eventually drop "apply --no-add", too.
>
> Thanks. I think the "virtual" stuff started its life outside
> sh-setup but later was moved there for p4merge. The log message for
> 4549162e (mergetools/p4merge: create a base if none available,
> 2013-03-13) seems to indicate that using an empty file does not work
> well over there as you suspected, so unfortunately we cannot lose it
> just yet.
Oh, indeed. I did find that commit in my git-blaming, but failed to
actually read it carefully. :)
With that, yeah, I agree that we cannot drop the virtual-base thing, and
my 3 patches are fine as-is.
-Peff
next prev parent reply other threads:[~2016-02-23 7:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 22:34 What's cooking in git.git (Feb 2016, #05; Wed, 17) Junio C Hamano
2016-02-17 23:25 ` Jeff King
2016-02-18 17:51 ` Junio C Hamano
2016-02-22 22:12 ` whither merge-tree? (was: What's cooking in git.git (Feb 2016, #05; Wed, 17)) Jeff King
2016-02-22 22:45 ` whither merge-tree? Junio C Hamano
2016-02-23 5:02 ` Jeff King
2016-02-23 5:14 ` Jeff King
2016-02-23 6:03 ` Jeff King
2016-02-23 6:04 ` [PATCH 1/3] merge-one-file: use empty blob for add/add base Jeff King
2016-02-23 6:06 ` [PATCH 2/3] merge-tree: drop generate_common strategy Jeff King
2016-02-23 6:07 ` [PATCH 3/3] xdiff: drop XDL_EMIT_COMMON Jeff King
2016-02-23 6:35 ` whither merge-tree? Junio C Hamano
2016-02-23 7:18 ` Jeff King [this message]
2016-02-23 9:49 ` Stefan Frühwirth
2016-02-24 7:28 ` Dennis Kaarsemaker
2016-02-24 7:57 ` Jeff King
2016-02-24 7:58 ` Jeff King
2016-02-23 12:36 ` Johannes Schindelin
2016-02-23 12:41 ` Duy Nguyen
Reply instructions:
You may reply publicly 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160223071812.GD8395@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stefan.fruehwirth@uni-graz.at \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).