undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  git-cvsimport: Handle "Removed" from pserver
This commit is contained in:
Junio C Hamano 2006-05-17 23:37:51 -07:00
commit eab864a2c4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-cvsimport.perl
View File

@ -350,7 +350,7 @@ sub _line {
return $res; return $res;
} elsif($line =~ s/^E //) { } elsif($line =~ s/^E //) {
# print STDERR "S: $line\n"; # print STDERR "S: $line\n";
} elsif($line =~ /^Remove-entry /i) { } elsif($line =~ /^(Remove-entry|Removed) /i) {
$line = $self->readline(); # filename $line = $self->readline(); # filename
$line = $self->readline(); # OK $line = $self->readline(); # OK
chomp $line; chomp $line;