nntp: hdr_msg_id: use named sub for long_response

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index b2d71a1f88b462493d3db527c609d00f4e16b31b..926fac803264288cf3a298b68c08cba62a59dfec 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -204,11 +204,13 @@ sub index_diff ($$$) {
                        $in_diff = $self->index_old_diff_fn(\%seen, $fa, $fb,
                                                        $xnq);
                } elsif (m!^--- ("?a/.+)!) {
-                       my $fn = (split('/', git_unquote($1), 2))[1];
+                       my $fn = $1;
+                       $fn = (split('/', git_unquote($fn), 2))[1];
                        $seen{$fn}++ or $self->index_diff_inc($fn, 'XDFN', $xnq);
                        $in_diff = 1;
                } elsif (m!^\+\+\+ ("?b/.+)!)  {
-                       my $fn = (split('/', git_unquote($1), 2))[1];
+                       my $fn = $1;
+                       $fn = (split('/', git_unquote($fn), 2))[1];
                        $seen{$fn}++ or $self->index_diff_inc($fn, 'XDFN', $xnq);
                        $in_diff = 1;
                } elsif (/^--- (\S+)/) {
@@ -590,6 +592,7 @@ sub read_log {
                        $newest ||= $latest;
                }
        }
+       close($log) or die "git log failed: \$?=$?";
        # get the leftovers
        foreach my $blob (keys %D) {
                my $mime = do_cat_mail($git, $blob, \$bytes) or next;
@@ -632,7 +635,7 @@ sub _git_log {
                             --no-notes --no-color --no-renames
                             --diff-filter=AM), $range);
        ++$fcount while <$fh>;
-       close $fh;
+       close $fh or die "git log failed: \$?=$?";
        my $high = $self->{mm}->num_highwater;
        $pr->("$fcount\n") if $pr; # continue previous line
        $self->{ntodo} = $fcount;
@@ -713,7 +716,10 @@ sub _index_sync {
        my $xdb = $self->begin_txn_lazy;
        my $mm = _msgmap_init($self);
        do {
-               $xlog = undef;
+               if ($xlog) {
+                       close($xlog) or die "git log failed: \$?=$?";
+                       $xlog = undef;
+               }
                $last_commit = _last_x_commit($self, $mm);
                $lx = reindex_from($opts->{reindex}, $last_commit);