From: "Richard Quirk" <richard.quirk@gmail.com>
To: "Michele Ballabio" <barra_cuda@katamail.com>
Cc: git@vger.kernel.org
Subject: Re: git-cherry-pick no longer detecting moved files in 1.5.3.4
Date: Wed, 17 Oct 2007 09:18:25 +0200 [thread overview]
Message-ID: <cac9e4380710170018p26ae8935xc4d3218f4db5411d@mail.gmail.com> (raw)
In-Reply-To: <200710170035.12482.barra_cuda@katamail.com>
On 10/17/07, Michele Ballabio <barra_cuda@katamail.com> wrote:
> 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.
next prev parent reply other threads:[~2007-10-17 7:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-16 22:17 git-cherry-pick no longer detecting moved files in 1.5.3.4 Richard Quirk
2007-10-16 22:35 ` Michele Ballabio
2007-10-17 7:18 ` Richard Quirk [this message]
2007-10-17 7:33 ` Shawn O. Pearce
2007-10-17 7:55 ` Richard Quirk
2007-10-17 0:58 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cac9e4380710170018p26ae8935xc4d3218f4db5411d@mail.gmail.com \
--to=richard.quirk@gmail.com \
--cc=barra_cuda@katamail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).