git-mv: follow -k request even on failing renames

diff --git a/git-mv.perl b/git-mv.perl
index 8d294d6529f158f65d318fc1c41fd27476639e8b..65b1dcfdf2314e2eb8b7bfd1124210ad73269b10 100755 (executable)
--- a/git-mv.perl
+++ b/git-mv.perl
@@ -151,6 +151,11 @@ ()
     if (!$opt_n) {
        if (!rename($src,$dst)) {
            $bad = "renaming '$src' failed: $!";
+           if ($opt_k) {
+               print "Warning: skipped: $bad\n";
+               $bad = "";
+               next;
+           }
            last;
        }
     }