Merge branch 'maint'

* maint: git-cvsimport: Handle "Removed" from pserver
git-mirror · May 18, 2006 · 18b01f4 · 18b01f4
2 parents 6cdfd17 + be0c7e0
commit 18b01f4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;