diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-17 23:37:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 23:37:51 -0700 |
| commit | eab864a2c4e887d40c816c93349ffc2cd4ceb351 (patch) | |
| tree | f23ae916f21e32024974813837fcda889f0c95e4 | |
| parent | Merge branch 'lt/dirwalk' into next (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-eab864a2c4e887d40c816c93349ffc2cd4ceb351.tar.xz | |
Merge branch 'master' into next
* master:
git-cvsimport: Handle "Removed" from pserver
| -rwxr-xr-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index c0ae00bda7..8c707f2c66 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; |