Code

git-cvsimport: Handle "Removed" from pserver
authorElrond <elrond+kernel.org@samba-tng.org>
Wed, 10 May 2006 17:37:04 +0000 (19:37 +0200)
committerJunio C Hamano <junkio@cox.net>
Thu, 18 May 2006 05:32:16 +0000 (22:32 -0700)
Sometimes the pserver says "Removed" instead of "Remove-entry".

Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-cvsimport.perl

index c0ae00bda74e68f98efc63c093efb73c7ff914f4..8c707f2c664ccfc9cad4fca443a5dee1d75604ba 100755 (executable)
@@ -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;