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.

diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 5d420de26feb5d5ccf138b5d2a18788ec2363261..570ff64fe3546fff2a5b7f7cb25d01f48c80ac1a 100644 (file)
--- 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 ab4cde7c0809a043e05a05e27fcc2fcb7d3ae030..e5f26ec33fab9e2642ca7e76a05b399b87b5c16e 100644 (file)
--- 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');