www: drop --subject from "git send-email" instructions

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 1d70975e855b48b08811594987015a28a1c13296..62b5a3439b2be772b004f13a5a8c2380a171f200 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -111,8 +111,6 @@ sub extract_diff ($$) {
        my ($self, $want, $smsg) = @$arg;
        my ($part) = @$p; # ignore $depth and @idx;
        my $ct = $part->content_type || 'text/plain';
-       my ($s, undef) = msg_part_text($part, $ct);
-       defined $s or return;
        my $post = $want->{oid_b};
        my $pre = $want->{oid_a};
        if (!defined($pre) || $pre !~ /\A[a-f0-9]+\z/) {
@@ -122,11 +120,12 @@ sub extract_diff ($$) {
        # Email::MIME::Encodings forces QP to be CRLF upon decoding,
        # change it back to LF:
        my $cte = $part->header('Content-Transfer-Encoding') || '';
+       my ($s, undef) = msg_part_text($part, $ct);
+       defined $s or return;
+       delete $part->{bdy};
        if ($cte =~ /\bquoted-printable\b/i && $part->crlf eq "\n") {
                $s =~ s/\r\n/\n/sg;
        }
-
-
        $s =~ m!( # $1 start header lines we save for debugging:
 
                # everything before ^index is optional, but we don't
@@ -169,6 +168,7 @@ sub extract_diff ($$) {
                # because git-apply(1) handles that case, too
                (?:^(?:[\@\+\x20\-\\][^\n]*|)$LF)+
        )!smx or return;
+       undef $s; # free memory
 
        my $di = {
                hdr_lines => $1,
@@ -293,14 +293,21 @@ sub do_git_init ($) {
                mkdir("$git_dir/$_") or die "mkdir $_: $!";
        }
        open my $fh, '>', "$git_dir/config" or die "open git/config: $!";
-       print $fh <<'EOF' or die "print git/config $!";
+       my $first = $self->{gits}->[0];
+       my $fmt = $first->object_format;
+       my $v = defined($$fmt) ? 1 : 0;
+       print $fh <<EOF or die "print git/config $!";
 [core]
-       repositoryFormatVersion = 0
+       repositoryFormatVersion = $v
        filemode = true
        bare = false
        fsyncObjectfiles = false
        logAllRefUpdates = false
 EOF
+       print $fh <<EOM if defined($$fmt);
+[extensions]
+       objectformat = $$fmt
+EOM
        close $fh or die "close git/config: $!";
 
        open $fh, '>', "$git_dir/HEAD" or die "open git/HEAD: $!";
@@ -593,8 +600,7 @@ sub resolve_patch ($$) {
        if (my $msgs = $want->{try_smsgs}) {
                my $smsg = shift @$msgs;
                if ($self->{psgi_env}->{'pi-httpd.async'}) {
-                       return git_async_cat($want->{cur_ibx}->git,
-                                               $smsg->{blob},
+                       return ibx_async_cat($want->{cur_ibx}, $smsg->{blob},
                                                \&extract_diff_async,
                                                [$self, $want, $smsg]);
                } else {
@@ -681,7 +687,7 @@ sub solve ($$$$$) {
        $self->{todo} = [ { %$hints, oid_b => $oid_want } ];
        $self->{patches} = []; # [ $di, $di, ... ]
        $self->{found} = {}; # { abbr => [ ::Git, oid, type, size, $di ] }
-       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXXXXXX", TMPDIR => 1);
+       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXX", TMPDIR => 1);
 
        dbg($self, "solving $oid_want ...");
        if (my $async = $env->{'pi-httpd.async'}) {