mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-31 06:17:56 +01:00
Code Activity

git-mv: fixes for path handling

Browse source 
Moving a directory ending in a slash was not working as the
destination was not calculated correctly.
E.g. in the git repo,

 git-mv t/ Documentation

gave the error

 Error: destination 'Documentation' already exists

To get rid of this problem, strip trailing slashes from all arguments.
The comment in cg-mv made me curious about this issue; Pasky, thanks!
As result, the workaround in cg-mv is not needed any more.

Also, another bug was shown by cg-mv. When moving files outside of
a subdirectory, it typically calls git-mv with something like

 git-mv Documentation/git.txt Documentation/../git-mv.txt

which triggers the following error from git-update-index:

 Ignoring path Documentation/../git-mv.txt

The result is a moved file, removed from git revisioning, but not
added again. To fix this, the paths have to be normalized not have ".."
in the middle. This was already done in git-mv, but only for
a better visual appearance :(

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Josef Weidendorfer 2006-03-01 19:09:23 +01:00 committed by Junio C Hamano
parent 5e6f85f6c1
commit 9e7c73de0b
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
git-mv.perl
View file

@ -31,13 +31,14 @@ ()
my (@srcArgs, @dstArgs, @srcs, @dsts); my (@srcArgs, @dstArgs, @srcs, @dsts);
my ($src, $dst, $base, $dstDir); my ($src, $dst, $base, $dstDir);
# remove any trailing slash in arguments
for (@ARGV) { s/\/*$//; }
my $argCount = scalar @ARGV; my $argCount = scalar @ARGV;
if (-d $ARGV[$argCount-1]) { if (-d $ARGV[$argCount-1]) {
$dstDir = $ARGV[$argCount-1]; $dstDir = $ARGV[$argCount-1];
# remove any trailing slash
$dstDir =~ s/\/$//;
@srcArgs = @ARGV[0..$argCount-2]; @srcArgs = @ARGV[0..$argCount-2];
foreach $src (@srcArgs) { foreach $src (@srcArgs) {
$base = $src; $base = $src;
$base =~ s/^.*\///; $base =~ s/^.*\///;
@ -61,6 +62,16 @@ ()
$dstDir = ""; $dstDir = "";
} }
# normalize paths, needed to compare against versioned files and update-index
# also, this is nicer to end-users by doing ".//a/./b/.//./c" ==> "a/b/c"
for (@srcArgs, @dstArgs) {
s|^\./||;
s|/\./|/| while (m|/\./|);
s|//+|/|g;
# Also "a/b/../c" ==> "a/c"
1 while (s,(^|/)[^/]+/\.\./,$1,);
}
my (@allfiles,@srcfiles,@dstfiles); my (@allfiles,@srcfiles,@dstfiles);
my $safesrc; my $safesrc;
my (%overwritten, %srcForDst); my (%overwritten, %srcForDst);
@ -79,15 +90,6 @@ ()
$dst = shift @dstArgs; $dst = shift @dstArgs;
$bad = ""; $bad = "";
for ($src, $dst) {
# Be nicer to end-users by doing ".//a/./b/.//./c" ==> "a/b/c"
s|^\./||;
s|/\./|/| while (m|/\./|);
s|//+|/|g;
# Also "a/b/../c" ==> "a/c"
1 while (s,(^|/)[^/]+/\.\./,$1,);
}
if ($opt_v) { if ($opt_v) {
print "Checking rename of '$src' to '$dst'\n"; print "Checking rename of '$src' to '$dst'\n";
} }