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
MCMarco Costalba <mcostalba@gmail.com>
Date
Feb 11, 2008, 07:42 UTC
Message-ID
<e5bfff550802102342r4b4d4c83mb3c9871d0206b2fa@mail.gmail.com>
In-Reply-To
<CF28A4AE-62F0-4E41-9794-2CF85C2C7855@zib.de>
On Feb 11, 2008 7:19 AM, Steffen Prohaska <prohaska@zib.de> wrote:
Show 7 quoted lines
>
>
> It doesn't make sense not to detect
> renames during a merge.
>
> Opinions?
>

I agree 100%, merge is a very important and sensible task and git should push as much as possible to avoid fails.

A failed merge is always an hassle for the developer also in simple cases and when a successful merge is possible git should really try to achieve that also if it takes a little time more.

So I second overriding diff.renamelimit in this case.
Marco
Previous: Steffen ProhaskaNext: Jeff King
Message 2 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.