git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Some git mv questions

From
JWJan Wielemaker <wielemak@science.uva.nl>
Date
Oct 16, 2007, 21:09 UTC
Message-ID
<200710162309.28739.wielemak@science.uva.nl>
In-Reply-To
<alpine.LFD.0.999.0710161030430.6887@woody.linux-foundation.org>
On Tuesday 16 October 2007 19:34, Linus Torvalds wrote:
Show 23 quoted lines
> On Tue, 16 Oct 2007, Lars Hjemli wrote:
> > 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.

Thanks both of you. I can master that. I understand I only should ensure to be running the latest version if I start the merge?

	Cheers --- Jan
Previous: Linus Torvalds
Message 4 of 4 in “Some git mv questions”
  1. Jan WielemakerOct 16, 2007
  2. Lars HjemliOct 16, 2007
  3. Linus TorvaldsOct 16, 2007
  4. Jan WielemakerOct 16, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.