solver: remove extra "^index $OID..$OID" line

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 8fde2329fa757a639aba76375c4ab63ffa55ab1b..53a626261e58aecfa1580a31ace931783b098c05 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -78,6 +78,14 @@ sub extract_diff ($$$$) {
        my ($s, undef) = msg_part_text($part, $ct);
        defined $s or return;
        my $di = {};
+
+       # Email::MIME::Encodings forces QP to be CRLF upon decoding,
+       # change it back to LF:
+       my $cte = $part->header('Content-Transfer-Encoding') || '';
+       if ($cte =~ /\bquoted-printable\b/i && $part->crlf eq "\n") {
+               $s =~ s/\r\n/\n/sg;
+       }
+
        foreach my $l (split(/^/m, $s)) {
                if ($l =~ $re) {
                        $di->{oid_a} = $1;
@@ -95,7 +103,7 @@ sub extract_diff ($$$$) {
 
                        push @$hdr_lines, $l;
                        $di->{hdr_lines} = $hdr_lines;
-                       print $tmp @$hdr_lines, $l or die "print(tmp): $!";
+                       print $tmp @$hdr_lines or die "print(tmp): $!";
 
                        # for debugging/diagnostics:
                        $di->{ibx} = $ibx;