From: Jeff King Date: Sun, 20 Feb 2011 10:12:47 GMT Subject: Re: [PATCH 2/4] bump rename limit defaults (again) Message-ID: <20110220101247.GD988@sigill.intra.peff.net> In-Reply-To: On Sat, Feb 19, 2011 at 09:12:49PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Sat, Feb 19, 2011 at 11:21, Jeff King wrote: > > > Let's bump the diff/merge default limits from 200/500 to > > 400/1000. Those are 2 seconds and 10 seconds respectively on > > my modern hardware. > > This is somewhat outside the scope of your patch, but rather than > making these decisions for the user and compiling them into Git > wouldn't it be better to expose it somehow? What do you mean by expose it? We already have config options; this is just for the defaults. Or do you mean allowing setting merge.renamelimits to "30s" and cutting off detection after 30 seconds? I think that would be a reasonable idea, though part of me doesn't like non-deterministic answers based on how loaded the system is. > E.g. when you do a git-merge show a progress bar (similar to > git-clone) showing that we're trying to do rename detection, show that > we stopped, and when we fail point out that the user could run > git-merge with some switch that would make Git try harder. Er, isn't that exactly what patches 1/4 and 4/4 in my series do? -Peff