Re: Some git mv questions

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Oct 16, 2007, 17:34 UTC
Message-ID: <alpine.LFD.0.999.0710161030430.6887@woody.linux-foundation.org>
In-Reply-To: <8c5c35580710160905v69787856m7ed11b037c1adef1@mail.gmail.com>

On Tue, 16 Oct 2007, Lars Hjemli wrote:

Show 6 quoted lines

> On 10/16/07, Jan Wielemaker <wielemak@science.uva.nl> wrote:
> >         * On a somewhat bigger test I moved a large directory using
> >         "git mv dir newdir" (where newdir is an existing directory).
> >         Now "git status" gives a lot of new and deleted files!?
> 
> You could try to adjust diff.renameLimit in .git/config

Yes. The default rename limit I did has turned out to be a disaster. It's quite common to have more than a 100x100 matrix of deleted files.

For people with any kind of beefy hardware, I'd just suggest doing a

	git config --global diff.renamelimit 0

which disables the rename limiting entirely.

There's a related (embarrassing) problem, namely that I think that the current released versions (1.5.3.3 and 1.5.3.4) don't honor the renamelimit configuration for merging, so if you do merges across renames with changes to the renamed files, you need to use either an older git that didn't have the rename limit at all (nor any of the speed-ups) or you need to use current git from the 'master' branch.

		Linus