git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fbf8ac2)
Fix git-mv for moving directories with 1 file
authorJosef Weidendorfer <redacted>
Wed, 23 Nov 2005 11:04:23 +0000 (12:04 +0100)
committerJunio C Hamano <redacted>
Thu, 24 Nov 2005 00:51:26 +0000 (16:51 -0800)
commit073dab137a746a44606e8e11629e05ff8343346f
treef3470b1639c966e33e95499a7c264b4400aeb5a2tree | snapshot
parentfbf8ac212caa74fc506434da83f8e9630b09ed12commit | diff
Fix git-mv for moving directories with 1 file

This is fixed by putting the file into @changedfiles/@addedfiles,
and not the directory this file is in.

Additionally, this fixes the behavior for attempting to overwrite
a file with a directory, and gives a message for all cases where
overwriting is not possible (file->dir,dir->file,dir->dir).

Thanks for Alexander Litvinov for noting this problem.

Signed-off-by: Josef Weidendorfer <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mv.perl diff | blob | history
git clone https://git.99rst.org/PROJECT