From: Jeff King <peff@peff.net>
Date: Thu, 10 May 2012 22:24:20 GMT
Subject: Re: [PATCH 6/8] apply: fall back on three-way merge
Message-ID: <20120510222420.GA31116@sigill.intra.peff.net>
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