spawn: allow passing GLOB handles for redirects

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

diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index e1f48771bd629c6dfe37b15b19138681b5bd1b2a..34f7d122af67526306dc6feebce30f2c0d9e1d9b 100644 (file)
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -66,7 +66,7 @@ sub gfi_start {
        my $git_dir = $git->{git_dir};
        my @cmd = ('git', "--git-dir=$git_dir", qw(fast-import
                        --quiet --done --date-format=raw));
-       my $rdr = { 0 => fileno($out_r), 1 => fileno($in_w) };
+       my $rdr = { 0 => $out_r, 1 => $in_w };
        my $pid = spawn(\@cmd, undef, $rdr);
        die "spawn fast-import failed: $!" unless defined $pid;
        $out_w->autoflush(1);
@@ -178,14 +178,14 @@ sub _update_git_info ($$) {
                my $env = { GIT_INDEX_FILE => $index };
                run_die([@cmd, qw(read-tree -m -v -i), $self->{ref}], $env);
        }
-       run_die([@cmd, 'update-server-info'], undef);
-       ($self->{path_type} eq '2/38') and eval {
+       run_die([@cmd, 'update-server-info']);
+       my $ibx = $self->{-inbox};
+       ($ibx && $self->{path_type} eq '2/38') and eval {
                require PublicInbox::SearchIdx;
-               my $ibx = $self->{-inbox} || $git_dir;
                my $s = PublicInbox::SearchIdx->new($ibx);
                $s->index_sync({ ref => $self->{ref} });
        };
-       eval { run_die([@cmd, qw(gc --auto)], undef) } if $do_gc;
+       eval { run_die([@cmd, qw(gc --auto)]) } if $do_gc;
 }
 
 sub barrier {
@@ -595,7 +595,7 @@ sub replace_oids {
 
        return if $nreplace == 0;
 
-       run_die([@git, qw(-c gc.reflogExpire=now gc --prune=all)]);
+       run_die([@git, qw(-c gc.reflogExpire=now gc --prune=all --quiet)]);
 
        # check that old OIDs are gone
        my $err = 0;