Merge branch 'master' into next

* master:
  cvsimport: do not barf on creation of an empty file.
This commit is contained in:
Junio C Hamano
2006-05-23 16:31:05 -07:00

View File

@ -371,7 +371,7 @@ sub file {
} }
sub _fetchfile { sub _fetchfile {
my ($self, $fh, $cnt) = @_; my ($self, $fh, $cnt) = @_;
my $res; my $res = 0;
my $bufsize = 1024 * 1024; my $bufsize = 1024 * 1024;
while($cnt) { while($cnt) {
if ($bufsize > $cnt) { if ($bufsize > $cnt) {