From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 19 Feb 2011 00:52:34 GMT
Subject: Re: Merging limitations after directory renames -- interesting test repo
Message-ID: <7vsjvkn8vh.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTimuU4A7sUqo-dpW3ch4H_WJg+G2ynNmagx=C9t8@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

> And the bug is that we didn't even ask for copy detection! This just
> confuses merging more.

Yeah, I think it is probably a good idea to really limit the rename
detection only to renames at least inside merge-recursive.  The static
variable does look ugly but it shouldn't be a rocket surgery to pass it
down if we want to.