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

["Shawn O. Pearce" <spearce@spearce.org>]

Richard Quirk <richard.quirk@gmail.com> wrote:
> On 10/17/07, Michele Ballabio <barra_cuda@katamail.com> wrote:
> > 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.

That's an "old" bug.  Lars Hjemli fixed this in df3a02f612 back on
Sept 25th.  You can get the fix from either Junio's or my git tree
in the master branch.

-- 
Shawn.