summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorElrond <elrond+kernel.org@samba-tng.org>2006-05-10 17:37:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-18 05:32:16 (GMT)
commitbe0c7e069738fbb697b0719f2252107261c9340e (patch)
treef71b1f9a6c1e08e3a43bfc15f04d208579968c7e /git-cvsimport.perl
parentc82a22c39cbc32576f64f5c6b3f24b99ea8149c7 (diff)
downloadgit-be0c7e069738fbb697b0719f2252107261c9340e.zip
git-be0c7e069738fbb697b0719f2252107261c9340e.tar.gz
git-be0c7e069738fbb697b0719f2252107261c9340e.tar.bz2
git-cvsimport: Handle "Removed" from pserver
Sometimes the pserver says "Removed" instead of "Remove-entry". Signed-off-by: Elrond <elrond+kernel.org@samba-tng.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index c0ae00b..8c707f2 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;