From 26169747b811b8ecd5693adfce4f5c7e322d2487 Mon Sep 17 00:00:00 2001 From: Josef Weidendorfer Date: Sun, 27 Nov 2005 22:11:33 +0100 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-mv.perl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git-mv.perl b/git-mv.perl index 8d294d652..65b1dcfdf 100755 --- a/git-mv.perl +++ b/git-mv.perl @@ -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; } } -- 2.30.2