diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-17 22:33:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 22:33:06 -0700 |
| commit | 18b01f4ff6db66b6419c7501bb303b643638b297 (patch) | |
| tree | 2d9b7f9e488c777bb7a86224d34845064cb0449f | |
| parent | commit: allow --pretty= args to be abbreviated (diff) | |
| parent | git-cvsimport: Handle "Removed" from pserver (diff) | |
| download | tgif-18b01f4ff6db66b6419c7501bb303b643638b297.tar.xz | |
Merge branch 'maint'
* maint:
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; |