From: Eric Wong <e@80x24.org>
Date: Tue, 21 Mar 2023 23:07:41 +0000 (+0000)
Subject: cindex: squelch incompatible options
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13c94e1c0f9e9c66b329c801bede3348ea267b22;p=thirdparty%2Fpublic-inbox.git

cindex: squelch incompatible options

Some options don't make sense when used together.
---

diff --git a/lib/PublicInbox/CodeSearchIdx.pm b/lib/PublicInbox/CodeSearchIdx.pm
index 5e6c0d22a..21c43973d 100644
--- a/lib/PublicInbox/CodeSearchIdx.pm
+++ b/lib/PublicInbox/CodeSearchIdx.pm
@@ -734,7 +734,7 @@ sub cidx_run { # main entry point
 			$m =~ s/\A(#?\s*)/$1$self->{current_info}: /;
 		$cb->($m, @_);
 	};
-	load_existing($self);
+	load_existing($self) unless $self->{-internal};
 	local $REINDEX;
 	if ($self->{-opt}->{reindex}) {
 		require PublicInbox::SharedKV;
diff --git a/script/public-inbox-cindex b/script/public-inbox-cindex
index e2500b930..f8a3ebbbe 100755
--- a/script/public-inbox-cindex
+++ b/script/public-inbox-cindex
@@ -52,6 +52,11 @@ my @git_dirs;
 if (defined(my $pl = $opt->{'project-list'})) {
 	my $pfx = shift @ARGV // die <<EOM;
 PROJECTS_ROOT required for --project-list
+EOM
+	@ARGV and die <<EOM;
+--project-list does not accept additional directories
+(@ARGV)
+beyond `$pfx'
 EOM
 	open my $fh, '<', $pl or die "open($pl): $!\n";
 	chomp(@git_dirs = <$fh>);
@@ -67,6 +72,9 @@ if (defined $cidx_dir) { # external index
 } elsif (!@git_dirs) {
 	die $help
 } else {
+	die <<EOM if $opt->{update};
+--update requires `-d EXTDIR'
+EOM
 	for my $gd (@git_dirs) {
 		my $cd = "$gd/public-inbox-cindex";
 		my $cidx = PublicInbox::CodeSearchIdx->new($cd, { %$opt });