From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 6/8] apply: fall back on three-way merge
Date: Thu, 10 May 2012 18:24:20 -0400 [thread overview]
Message-ID: <20120510222420.GA31116@sigill.intra.peff.net> (raw)
In-Reply-To: <7vaa1fn3u8.fsf@alter.siamese.dyndns.org>
On Thu, May 10, 2012 at 02:06:23PM -0700, Junio C Hamano wrote:
> > Is it true that there is no point in doing a 3-way fallback when
> > patch->is_binary? What if the user has a custom merge driver?
> > ...
> > It seems like we should just keep the logic here as stupid as possible,
>
> Actually, the motivation behind that "No point" is to keep the logic as
> stupid as possible.
> [...]
> I can buy that lifting "must not be binary" would be very cheap, but
> adding support for new/delete case would mean the index-stuffing part
> needs to gain more code, so removing the "not new, not delete"
> conditionals actually goes against keeping the logic as stupid as
> possible.
Fair enough. It's by far the minority case, so we can wait until
it is somebody's itch to scratch.
-Peff
next prev parent reply other threads:[~2012-05-10 22:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-10 6:02 [PATCH 0/8] "git apply --threeway" Junio C Hamano
2012-05-10 6:02 ` [PATCH 1/8] apply: reformat comment Junio C Hamano
2012-05-10 6:02 ` [PATCH 2/8] apply: accept --threeway command line option Junio C Hamano
2012-05-10 12:40 ` Nguyen Thai Ngoc Duy
2012-05-10 15:31 ` Junio C Hamano
2012-05-10 6:02 ` [PATCH 3/8] apply: split load_preimage() helper function out Junio C Hamano
2012-05-10 6:02 ` [PATCH 4/8] apply: clear_image() clears things a bit more Junio C Hamano
2012-05-10 6:02 ` [PATCH 5/8] apply: refactor read_file_or_gitlink() Junio C Hamano
2012-05-10 6:02 ` [PATCH 6/8] apply: fall back on three-way merge Junio C Hamano
2012-05-10 7:26 ` Matthieu Moy
2012-05-10 15:10 ` Junio C Hamano
2012-05-10 15:41 ` Matthieu Moy
2012-05-10 20:31 ` Jeff King
2012-05-10 21:06 ` Junio C Hamano
2012-05-10 22:24 ` Jeff King [this message]
2012-05-10 6:02 ` [PATCH 7/8] apply: plug the three-way merge logic in Junio C Hamano
2012-05-10 6:02 ` [PATCH 8/8] apply: register conflicted stages to the index Junio C Hamano
2012-05-10 7:31 ` [PATCH 0/8] "git apply --threeway" Matthieu Moy
2012-05-10 15:26 ` Junio C Hamano
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=20120510222420.GA31116@sigill.intra.peff.net \
--to=peff@peff.net \
--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
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).