Browse Source

Merge branch 'maint'

* maint:
  git-cvsimport: Handle "Removed" from pserver
maint
Junio C Hamano 19 years ago
parent
commit
18b01f4ff6
  1. 2
      git-cvsimport.perl

2
git-cvsimport.perl

@ -350,7 +350,7 @@ sub _line { @@ -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;

Loading…
Cancel
Save