summaryrefslogtreecommitdiff
path: root/git-mv.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-01 20:16:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-01 20:16:25 (GMT)
commit4d569a2c422a9655390e7d33cad0bab88379f13d (patch)
treeacceb2dbffc0ef6911dc53a5390f94adcb3ba29b /git-mv.perl
parent858cbfbabe4ede5f5eba32041eb7448319e53e2a (diff)
parent9e7c73de0bcd410d12f897b19419dd35accd961e (diff)
downloadgit-4d569a2c422a9655390e7d33cad0bab88379f13d.zip
git-4d569a2c422a9655390e7d33cad0bab88379f13d.tar.gz
git-4d569a2c422a9655390e7d33cad0bab88379f13d.tar.bz2
Merge git-mv fixes from 'maint'
Diffstat (limited to 'git-mv.perl')
-rwxr-xr-xgit-mv.perl33
1 files changed, 24 insertions, 9 deletions
diff --git a/git-mv.perl b/git-mv.perl
index 2ea852c..fe9c40e 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -19,25 +19,26 @@ EOT
exit(1);
}
-my $GIT_DIR = `git rev-parse --git-dir`;
-exit 1 if $?; # rev-parse would have given "not a git dir" message.
-chomp($GIT_DIR);
-
our ($opt_n, $opt_f, $opt_h, $opt_k, $opt_v);
getopts("hnfkv") || usage;
usage() if $opt_h;
@ARGV >= 1 or usage;
+my $GIT_DIR = `git rev-parse --git-dir`;
+exit 1 if $?; # rev-parse would have given "not a git dir" message.
+chomp($GIT_DIR);
+
my (@srcArgs, @dstArgs, @srcs, @dsts);
my ($src, $dst, $base, $dstDir);
+# remove any trailing slash in arguments
+for (@ARGV) { s/\/*$//; }
+
my $argCount = scalar @ARGV;
if (-d $ARGV[$argCount-1]) {
$dstDir = $ARGV[$argCount-1];
- # remove any trailing slash
- $dstDir =~ s/\/$//;
@srcArgs = @ARGV[0..$argCount-2];
-
+
foreach $src (@srcArgs) {
$base = $src;
$base =~ s/^.*\///;
@@ -46,10 +47,14 @@ if (-d $ARGV[$argCount-1]) {
}
}
else {
- if ($argCount != 2) {
+ if ($argCount < 2) {
+ print "Error: need at least two arguments\n";
+ exit(1);
+ }
+ if ($argCount > 2) {
print "Error: moving to directory '"
. $ARGV[$argCount-1]
- . "' not possible; not exisiting\n";
+ . "' not possible; not existing\n";
exit(1);
}
@srcArgs = ($ARGV[0]);
@@ -57,6 +62,16 @@ else {
$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 $safesrc;
my (%overwritten, %srcForDst);