From f6bc189a457b2575587f26e27f1eabdd615b2d78 Mon Sep 17 00:00:00 2001 From: Josef Weidendorfer Date: Sun, 27 Nov 2005 22:04:14 +0100 Subject: [PATCH] git-mv: keep git index consistent with file system on failed rename When doing multiple renames, and a rename in the middle fails, git-mv did not store the successful renames in the git index; this is fixed by delaying the error message on a failed rename to after the git updating. Signed-off-by: Josef Weidendorfer Signed-off-by: Junio C Hamano --- git-mv.perl | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/git-mv.perl b/git-mv.perl index 990bec503..ac19876fe 100755 --- a/git-mv.perl +++ b/git-mv.perl @@ -142,14 +142,17 @@ while(scalar @srcArgs > 0) { # Final pass: rename/move my (@deletedfiles,@addedfiles,@changedfiles); +$bad = ""; while(scalar @srcs > 0) { $src = shift @srcs; $dst = shift @dsts; if ($opt_n || $opt_v) { print "Renaming $src to $dst\n"; } if (!$opt_n) { - rename($src,$dst) - or die "rename failed: $!"; + if (!rename($src,$dst)) { + $bad = "renaming '$src' failed: $!"; + last; + } } $safesrc = quotemeta($src); @@ -209,3 +212,8 @@ else { close(H); } } + +if ($bad ne "") { + print "Error: $bad\n"; + exit(1); +} -- 2.30.2