From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Mar 2012 19:12:06 GMT
Subject: Re: Strange effect merging empty file
Message-ID: <7vwr6cwiux.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20120322190303.GA32756@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> That is a slight layering violation, in that we are making assumptions
> about how the diffcore-rename subsystem works.

I do not think I have to say any more than that.  The special case we want
to have is for the "empty to empty" case and nothing else, and I do not
want to see people having to remember to look at the merge-recursive code
if/when rename detection starts to treat "empty to small" as "rename with
minor modification."