From: Elrond Date: Wed, 10 May 2006 17:37:04 +0000 (+0200) Subject: git-cvsimport: Handle "Removed" from pserver X-Git-Tag: v1.4.0-rc1~129^2 X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=be0c7e069738fbb697b0719f2252107261c9340e;p=git.git git-cvsimport: Handle "Removed" from pserver Sometimes the pserver says "Removed" instead of "Remove-entry". Signed-off-by: Elrond Signed-off-by: Junio C Hamano --- diff --git a/git-cvsimport.perl b/git-cvsimport.perl index c0ae00bd..8c707f2c 100755 --- 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;