Re: rm and mv commands: should I use them?

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 7, 2008, 02:05 UTC
Message-ID: <7v63y62xwj.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080107015518.GD17748@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

> I haven't looked to see if this optimization is in place, but "git mv"
> can also avoid having to recompute the sha1 of the file (which in most
> cases doesn't matter, but on a large file with a cold cache, can make
> the operation seem just as snappy as a regular "mv").

Actually, I think I found a bug.

	$ git reset --hard
	$ echo >>Makefile
        $ git diff --numstat
        1	0	Makefile
        $ git mv Makefile makefile
        $ git diff
        $ git diff --cached -M --numstat
        1	0	Makefile => makefile

"git mv" should not have staged the change. It should have moved the index entry from Makefile to makefile and moved the work tree files.

The fix for this would fall out from your "optimization" quite naturally, but I think that might be a post 1.5.4 item.