On Mon, Feb 11, 2008 at 07:19:32AM +0100, Steffen Prohaska wrote: > I think that limiting rename detection during merge is a really > bad idea. Either we should set it to unlimited, or at least we > should print a BIG WARNING that rename detection is limited > during the merge. I'd propose to override diff.renamelimit > to unlimited for a merge, even if diff.renamelimit is explicitly > configured by the user. It doesn't make sense not to detect > renames during a merge. > > Opinions? The point of diff.renamelimit was that some rename detection is literally so time-consuming that we might as well not bother starting it. The number '100' was pulled out of Linus', er, hat. Perhaps a better argument is that the renamelimit should be set much higher to accomplish that goal? It may also be that multiple rename limits are appropriate. I don't mind waiting 30 seconds for rename detection during a particularly tricky merge. I probably do when running 'git-log -p'. -Peff - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
