diff options
| -rw-r--r-- | lib/PublicInbox/Inbox.pm | 4 | ||||
| -rw-r--r-- | lib/PublicInbox/SearchIdx.pm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm index 34191fc7..87c2c9fc 100644 --- a/lib/PublicInbox/Inbox.pm +++ b/lib/PublicInbox/Inbox.pm @@ -99,7 +99,9 @@ sub nntp_usable { sub msg_by_path ($$;$) { my ($self, $path, $ref) = @_; # TODO: allow other refs: - git($self)->cat_file('HEAD:'.$path, $ref); + my $str = git($self)->cat_file('HEAD:'.$path, $ref); + $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; + $str; } sub msg_by_mid ($$;$) { diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm index 58eccc1a..c2bf9a2d 100644 --- a/lib/PublicInbox/SearchIdx.pm +++ b/lib/PublicInbox/SearchIdx.pm @@ -311,6 +311,8 @@ 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; Email::MIME->new($str); }; $@ ? undef : $mime; |