X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-mv.perl;h=b6c0b4881845bf6a8d9681817fc540a2003b889e;hb=4275df517022604f5c33ba05ae45a885b84e3472;hp=8d294d6529f158f65d318fc1c41fd27476639e8b;hpb=ca203ee7db708baa278950501f8d01f29c5190be;p=git.git

diff --git a/git-mv.perl b/git-mv.perl
index 8d294d65..b6c0b488 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -19,15 +19,9 @@ EOT
 	exit(1);
 }
 
-# Sanity checks:
-my $GIT_DIR = $ENV{'GIT_DIR'} || ".git";
-
-unless ( -d $GIT_DIR && -d $GIT_DIR . "/objects" && 
-	-d $GIT_DIR . "/objects/" && -d $GIT_DIR . "/refs") {
-    print "Error: git repository not found.";
-    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;
@@ -108,7 +102,7 @@ while(scalar @srcArgs > 0) {
 	}
     }
     
-    if (($bad eq "") && ($dst =~ /^$src\//)) {
+    if (($bad eq "") && ($dst =~ /^$safesrc\//)) {
 	$bad = "can not move directory '$src' into itself";
     }
 
@@ -151,6 +145,11 @@ while(scalar @srcs > 0) {
     if (!$opt_n) {
 	if (!rename($src,$dst)) {
 	    $bad = "renaming '$src' failed: $!";
+	    if ($opt_k) {
+		print "Warning: skipped: $bad\n";
+		$bad = "";
+		next;
+	    }
 	    last;
 	}
     }