git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Lars Hjemli <hjemli@gmail.com>
Cc: Jan Wielemaker <wielemak@science.uva.nl>, git list <git@vger.kernel.org>
Subject: Re: Some git mv questions
Date: Tue, 16 Oct 2007 10:34:01 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.0.999.0710161030430.6887@woody.linux-foundation.org> (raw)
In-Reply-To: <8c5c35580710160905v69787856m7ed11b037c1adef1@mail.gmail.com>



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.

		Linus

  reply	other threads:[~2007-10-16 17:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-16 15:33 Some git mv questions Jan Wielemaker
2007-10-16 16:05 ` Lars Hjemli
2007-10-16 17:34   ` Linus Torvalds [this message]
2007-10-16 21:09     ` Jan Wielemaker

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=alpine.LFD.0.999.0710161030430.6887@woody.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=git@vger.kernel.org \
    --cc=hjemli@gmail.com \
    --cc=wielemak@science.uva.nl \
    /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).