From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 04D9B1F51A for ; Wed, 25 Oct 2023 15:33:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1698248030; bh=FIvDlH6ZZ/OfMP0qDnPBiSXmhpGaAhF0ZikbARcbKFU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=FU4udCxHqANRofOglTXCL4cRu/KGlUPbZKTmQwsw3wIlwly5IkZo7mYxryH9bSqwa lWZLW5xhFA4eaAy5NEUIbspc1Z+fEodZy5/xCalbknxhG6/vAVz3a7nPxcZJNAWATm 0teu+MdKom6XnzDkGQOBxuAZ5aY8XfpwfJL0DGOE= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 2/3] cindex: quiet --prune when checking objectFormat Date: Wed, 25 Oct 2023 15:33:48 +0000 Message-ID: <20231025153349.3247178-3-e@80x24.org> In-Reply-To: <20231025153349.3247178-1-e@80x24.org> References: <20231025153349.3247178-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Most coderepos don't have extensions.objectFormat set, so it's senseless to emit warnings on failures. Fixes: 709fcf00c4d5 (cindex: use run_await to read extensions.objectFormat) --- lib/PublicInbox/CodeSearchIdx.pm | 3 ++- t/cindex.t | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index f2fd28e3..80636270 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -858,7 +858,8 @@ sub prep_alternate_start { } my $cmd = [ 'git', "--git-dir=$git_dir", qw(config extensions.objectFormat) ]; - run_await($cmd, undef, undef, \&prep_alternate_end, $o, $run_prune); + my $opt = { quiet => 1 }; + run_await($cmd, undef, $opt, \&prep_alternate_end, $o, $run_prune); } sub cmd_done { # run_await cb for sort, xapian-delve, sed failures diff --git a/t/cindex.t b/t/cindex.t index c7de1505..09183518 100644 --- a/t/cindex.t +++ b/t/cindex.t @@ -13,6 +13,7 @@ my ($tmp, $for_destroy) = tmpdir(); my $pwd = getcwd(); my @unused_keys = qw(last_commit has_threadid skip_docdata); local $ENV{PI_CONFIG} = '/dev/null'; +my $opt = { 1 => \(my $cidx_out), 2 => \(my $cidx_err) }; # I reworked CodeSearchIdx->shard_worker to handle empty trees # in the initial commit generated by cvs2svn for xapian.git @@ -166,7 +167,9 @@ SKIP: { # --prune is(scalar($csrch->mset('s:hi')->items), 1, 'got hit'); rename("$tmp/wt0/.git", "$tmp/wt0/.giit"); - ok(run_script([qw(-cindex -q --prune -d), "$tmp/ext"]), 'prune'); + ok(run_script([qw(-cindex -q --prune -d), "$tmp/ext"], undef, $opt), + 'prune'); + is(${$opt->{2}}, '', 'nothing in stderr') or diag explain($opt); $csrch->reopen; is(scalar($csrch->mset('s:hi')->items), 0, 'hit pruned'); @@ -213,7 +216,7 @@ EOM close $fh; my $cmd = [ qw(-cindex -u --all --associate -d), "$tmp/ext", '-I', $basic->{inboxdir} ]; - my $opt = { 1 => \(my $cidx_out), 2 => \(my $cidx_err) }; + $cidx_out = $cidx_err = ''; ok(run_script($cmd, $env, $opt), 'associate w/o search'); like($cidx_err, qr/W: \Q$basic->{inboxdir}\E not indexed for search/, 'non-Xapian-enabled inbox noted');