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

Re: git-cherry-pick no longer detecting moved files in 1.5.3.4

From
RQRichard Quirk <richard.quirk@gmail.com>
Date
Oct 17, 2007, 07:18 UTC
Message-ID
<cac9e4380710170018p26ae8935xc4d3218f4db5411d@mail.gmail.com>
In-Reply-To
<200710170035.12482.barra_cuda@katamail.com>
On 10/17/07, Michele Ballabio <barra_cuda@katamail.com> wrote:
Show 9 quoted lines
> On Wednesday 17 October 2007, Richard Quirk wrote:
> > I tried setting diff.renamelimit to -1 but to no
> > avail.
>
> It should be
> diff.renamelimit = 0
>
> to set the "unlimited" limit.
>

This doesn't work either. Cherry picking is not triggering the loading of this value at all.

This is because git-cherry-pick turns into a git-merge-recursive. This calls get_renames() in merge-recursive.c, which calls diff_setup, setting the renamelimit to -1, then calls diff_setup_done(), which sets the renamelimit to diff_rename_limit_default since rename_limit was < 0. diff_rename_limit_default is the hard-coded value of 100. At no point does merge-recursive call git_diff_ui_config() in diff.c that reads in the diff.renamelimit user defined value, so in the end the cherry pick uses the hardcoded value of 100.

Previous: Michele BallabioNext: Shawn O. Pearce
Message 3 of 6 in “git-cherry-pick no longer detecting moved files in 1.5.3.4”
  1. Richard QuirkOct 16, 2007
  2. Michele BallabioOct 16, 2007
  3. Richard QuirkOct 17, 2007
  4. Shawn O. PearceOct 17, 2007
  5. Richard QuirkOct 17, 2007
  6. Shawn O. PearceOct 17, 2007

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.