reduce scope of mbox From_ line removal

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 9a5484e30b81b8ac29bb9bbfa43816ac6ee04210..579b85e3927cfd70df044db9ff9a224335e2a1d9 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -551,13 +551,9 @@ sub unindex_both {
 
 sub do_cat_mail {
        my ($git, $blob, $sizeref) = @_;
-       my $mime = eval {
-               my $str = $git->cat_file($blob, $sizeref);
-               # fixup bugs from import:
-               $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
-               PublicInbox::MIME->new($str);
-       };
-       $@ ? undef : $mime;
+       my $str = $git->cat_file($blob, $sizeref) or
+               die "BUG: $blob not found in $git->{git_dir}";
+       PublicInbox::MIME->new($str);
 }
 
 # called by public-inbox-index
@@ -602,7 +598,7 @@ sub read_log {
                                }
                                next;
                        }
-                       my $mime = do_cat_mail($git, $blob, \$bytes) or next;
+                       my $mime = do_cat_mail($git, $blob, \$bytes);
                        my $smsg = bless {}, 'PublicInbox::Smsg';
                        batch_adjust(\$max, $bytes, $batch_cb, $latest, ++$nr);
                        $smsg->{blob} = $blob;
@@ -623,7 +619,7 @@ sub read_log {
        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;
+               my $mime = do_cat_mail($git, $blob, \$bytes);
                $del_cb->($self, $mime);
        }
        $batch_cb->($nr, $latest, $newest);
@@ -634,7 +630,7 @@ sub _git_log {
        my $git = $self->{git};
 
        if (index($range, '..') < 0) {
-               # don't show annoying git errrors to users who run -index
+               # don't show annoying git errors to users who run -index
                # on empty inboxes
                $git->qx(qw(rev-parse -q --verify), "$range^0");
                if ($?) {