Merge remote-tracking branch 'origin/manifest' into next

[public-inbox.git] / lib / PublicInbox / Git.pm

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 82510b99641200bd014ffdc9d6a537ae22775220..f5c7a95c34d7aedad7860a1189f8e121167eb1fb 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -145,41 +145,24 @@ again:
                fail($self, "Unexpected result from git cat-file: $head");
 
        my $size = $1;
-       my $ref_type = $ref ? ref($ref) : '';
-
        my $rv;
        my $left = $size;
-       $$ref = $size if ($ref_type eq 'SCALAR');
-       my $cb_err;
-
-       if ($ref_type eq 'CODE') {
-               $rv = eval { $ref->($in, \$left) };
-               $cb_err = $@;
-               # drain the rest
-               my $max = 8192;
-               while ($left > 0) {
-                       my $r = read($in, my $x, $left > $max ? $max : $left);
-                       defined($r) or fail($self, "read failed: $!");
-                       $r == 0 and fail($self, 'exited unexpectedly');
-                       $left -= $r;
-               }
-       } else {
-               my $offset = 0;
-               my $buf = '';
-               while ($left > 0) {
-                       my $r = read($in, $buf, $left, $offset);
-                       defined($r) or fail($self, "read failed: $!");
-                       $r == 0 and fail($self, 'exited unexpectedly');
-                       $left -= $r;
-                       $offset += $r;
-               }
-               $rv = \$buf;
+       $$ref = $size if $ref;
+
+       my $offset = 0;
+       my $buf = '';
+       while ($left > 0) {
+               my $r = read($in, $buf, $left, $offset);
+               defined($r) or fail($self, "read failed: $!");
+               $r == 0 and fail($self, 'exited unexpectedly');
+               $left -= $r;
+               $offset += $r;
        }
+       $rv = \$buf;
 
-       my $r = read($in, my $buf, 1);
+       my $r = read($in, my $lf, 1);
        defined($r) or fail($self, "read failed: $!");
-       fail($self, 'newline missing after blob') if ($r != 1 || $buf ne "\n");
-       die $cb_err if $cb_err;
+       fail($self, 'newline missing after blob') if ($r != 1 || $lf ne "\n");
 
        $rv;
 }