X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=git-mv.perl;h=65b1dcfdf2314e2eb8b7bfd1124210ad73269b10;hb=650e4be59b9f385f56e5829d97d09e8440f174b8;hp=ac19876fecbd2758e2782ae3f3423a727a036bd3;hpb=f6bc189a457b2575587f26e27f1eabdd615b2d78;p=git.git

diff --git a/git-mv.perl b/git-mv.perl
index ac19876f..65b1dcfd 100755
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -108,7 +108,7 @@ while(scalar @srcArgs > 0) {
 	}
     }
     
-    if (($bad eq "") && ($src eq $dstDir)) {
+    if (($bad eq "") && ($dst =~ /^$src\//)) {
 	$bad = "can not move directory '$src' into itself";
     }
 
@@ -151,6 +151,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;
 	}
     }