Re: git-mv redux: there must be something else going on

From: Pete Harlan <pgit@pcharlan.com>
Date: Feb 3, 2010, 20:12 UTC
Message-ID: <4B69D897.2060908@pcharlan.com>
In-Reply-To: <32541b131002031048i26d166d9w3567a60515235c34@mail.gmail.com>

On 02/03/2010 10:48 AM, Avery Pennarun wrote:

Show 10 quoted lines

>> [ron@mickey:~/devel/gittest]$ git mv file2 file3
>> [ron@mickey:~/devel/gittest]$ git commit -m 'letters->numbers'
>> [master ae3f6d4] letters->numbers
>>  1 files changed, 0 insertions(+), 0 deletions(-)
>>  rename file2 => file3 (100%)
> 
> Whoops.  You didn't 'git add file2' (before the mv) or 'git add file3'
> (after the mv), or use commit -a, so what you've committed is the
> *old* content of file2 under the name file3.  The *new* content of
> file2 is still uncommitted in your work tree under the name file3.

It may be reasonable for "git mv foo bar" to print a helpful message to the user if foo has un-checked-in changes, similarly to what "git rm" does.

Unlike "git rm", "git mv" could still perform the operation even without "-f", but the semantics of "git mv" differ enough from plain "mv" that a short blurb from Git in that case might help.

--Pete