projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6cdfd17
)
Merge branch 'maint'
author
Junio C Hamano
<junkio@cox.net>
Thu, 18 May 2006 05:33:06 +0000
(22:33 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 18 May 2006 05:33:06 +0000
(22:33 -0700)
* maint:
git-cvsimport: Handle "Removed" from pserver
git-cvsimport.perl
patch
|
blob
|
history
diff --git
a/git-cvsimport.perl
b/git-cvsimport.perl
index
c0ae00b
..
8c707f2
100755
(executable)
--- 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;