Merge early part of 'sp/reflog' branch

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index c0ae00bda74e68f98efc63c093efb73c7ff914f4..8c707f2c664ccfc9cad4fca443a5dee1d75604ba 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -350,7 +350,7 @@ sub _line {
                                return $res;
                        } elsif($line =~ s/^E //) {
                                # print STDERR "S: $line\n";
-                       } elsif($line =~ /^Remove-entry /i) {
+                       } elsif($line =~ /^(Remove-entry|Removed) /i) {
                                $line = $self->readline(); # filename
                                $line = $self->readline(); # OK
                                chomp $line;