From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 643711F5AD for ; Fri, 15 Nov 2019 09:51:02 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 09/29] import: only pass Inbox object to SearchIdx->new Date: Fri, 15 Nov 2019 09:50:40 +0000 Message-Id: <20191115095100.25633-10-e@80x24.org> In-Reply-To: <20191115095100.25633-1-e@80x24.org> References: <20191115095100.25633-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: SearchIdx->new no longer accepts a GIT_DIR path as its argument since commit 585314673236d664729fe3ab2d4fb229d1c0f2d5 ("searchidx: require PublicInbox::Inbox (or InboxWritable) ref") --- lib/PublicInbox/Import.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm index e1f48771..cb25215d 100644 --- a/lib/PublicInbox/Import.pm +++ b/lib/PublicInbox/Import.pm @@ -179,9 +179,9 @@ sub _update_git_info ($$) { 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 { + 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} }); };