git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: limiting rename detection during merge is a really bad idea

From
Jeff King <peff@peff.net>
Date
Feb 11, 2008, 07:48 UTC
Message-ID
<20080211074817.GA18898@sigill.intra.peff.net>
In-Reply-To
<CF28A4AE-62F0-4E41-9794-2CF85C2C7855@zib.de>
On Mon, Feb 11, 2008 at 07:19:32AM +0100, Steffen Prohaska wrote:
Show 9 quoted lines
> 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
Previous: Marco CostalbaNext: Marco Costalba
Message 3 of 11 in “limiting rename detection during merge is a really bad idea”
  1. Steffen ProhaskaFeb 11, 2008
  2. Marco CostalbaFeb 11, 2008
  3. Jeff KingFeb 11, 2008
  4. Marco CostalbaFeb 11, 2008
  5. Jeff KingFeb 11, 2008
  6. Lars HjemliFeb 11, 2008
  7. Jeff KingFeb 11, 2008
  8. Santi BéjarFeb 11, 2008
  9. Jeff KingFeb 11, 2008
  10. Steffen ProhaskaFeb 11, 2008
  11. Jeff KingFeb 11, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.