git-mv: follow -k request even on failing renames
-k requests to keep running on an error condition. Previously, git-mv stopped on failing renames even with -k. There are some error conditions which are not checked in the first phase of git-mv, eg. 'permission denied'. Still, option -k should work. Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
b933e818e9
commit
26169747b8
@ -151,6 +151,11 @@ ()
|
|||||||
if (!$opt_n) {
|
if (!$opt_n) {
|
||||||
if (!rename($src,$dst)) {
|
if (!rename($src,$dst)) {
|
||||||
$bad = "renaming '$src' failed: $!";
|
$bad = "renaming '$src' failed: $!";
|
||||||
|
if ($opt_k) {
|
||||||
|
print "Warning: skipped: $bad\n";
|
||||||
|
$bad = "";
|
||||||
|
next;
|
||||||
|
}
|
||||||
last;
|
last;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user