From aa516f68573f3e3b965ee38f6469225011d078c9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 15 Dec 2023 15:22:47 -0500 Subject: cindex: --prune needs git 2.6+ Older versions of git lack --batch-all-objects, and 2.6+ is new enough already since v2, lei, etc all depend on it. --- lib/PublicInbox/CodeSearchIdx.pm | 2 ++ t/cindex.t | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm index 5d420de2..570ff64f 100644 --- a/lib/PublicInbox/CodeSearchIdx.pm +++ b/lib/PublicInbox/CodeSearchIdx.pm @@ -1305,6 +1305,8 @@ sub cidx_run { # main entry point my $v = $self->{-opt}->{"sort-$_"}; push @SORT, "--$_=$v" if defined $v; } + ($self->{-opt}->{prune} && $GIT_VER le v2.6) and + die "W: --prune requires git v2.6+\n"; init_join_prefork($self) } local @IDX_SHARDS = cidx_init($self); # forks workers diff --git a/t/cindex.t b/t/cindex.t index ab4cde7c..e5f26ec3 100644 --- a/t/cindex.t +++ b/t/cindex.t @@ -209,6 +209,7 @@ EOM SKIP: { # --prune require_cmd($ENV{XAPIAN_DELVE} || 'xapian-delve', 1); + require_git v2.6, 1; my $csrch = PublicInbox::CodeSearch->new("$tmp/ext"); is(scalar($csrch->mset('s:hi')->items), 1, 'got hit'); -- cgit v1.2.3-24-ge0c7