From: Jeff King <peff@peff.net>
To: Steffen Prohaska <prohaska@zib.de>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: limiting rename detection during merge is a really bad idea
Date: Mon, 11 Feb 2008 02:48:17 -0500 [thread overview]
Message-ID: <20080211074817.GA18898@sigill.intra.peff.net> (raw)
In-Reply-To: <CF28A4AE-62F0-4E41-9794-2CF85C2C7855@zib.de>
On Mon, Feb 11, 2008 at 07:19:32AM +0100, Steffen Prohaska wrote:
> 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
next prev parent reply other threads:[~2008-02-11 7:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 6:19 limiting rename detection during merge is a really bad idea Steffen Prohaska
2008-02-11 7:42 ` Marco Costalba
2008-02-11 7:48 ` Jeff King [this message]
2008-02-11 7:55 ` Marco Costalba
2008-02-11 8:03 ` Jeff King
2008-02-11 10:41 ` Lars Hjemli
2008-02-11 11:08 ` Jeff King
2008-02-11 11:20 ` Santi Béjar
2008-02-11 11:40 ` Jeff King
2008-02-11 13:29 ` Steffen Prohaska
2008-02-11 11:35 ` Jeff King
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=20080211074817.GA18898@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=prohaska@zib.de \
/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).