dumping ground for random patches and texts
 help / color / mirror / Atom feed
From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH] eidxsharefix fixes
Date: Thu, 30 Nov 2023 09:56:39 +0000	[thread overview]
Message-ID: <20231130095639.372344-1-e@80x24.org> (raw)

---
 lib/PublicInbox/GitAsyncCat.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/GitAsyncCat.pm b/lib/PublicInbox/GitAsyncCat.pm
index 81669307..d078051e 100644
--- a/lib/PublicInbox/GitAsyncCat.pm
+++ b/lib/PublicInbox/GitAsyncCat.pm
@@ -9,17 +9,17 @@ our $GCF2C; # singleton PublicInbox::Gcf2Client
 
 sub ibx_async_cat ($$$$) {
 	my ($ibx, $oid, $cb, $arg) = @_;
-	my $git = $ibx->{isrch} ? $ibx->{isrch}->{es}->git :
-			($ibx->{git} // $ibx->git);
+	my $isrch = $ibx->{isrch};
+	my $git = $isrch ? $isrch->{es}->git : ($ibx->{git} // $ibx->git);
 	# {topdir} means ExtSearch (likely [extindex "all"]) with potentially
 	# 100K alternates.  git v2.33+ can handle 100k alternates fairly well.
-	if (!defined($ibx->{topdir}) && !defined($git->{-tmp}) &&
+	if (!$isrch && !defined($ibx->{topdir}) && !defined($git->{-tmp}) &&
 		($GCF2C //= eval {
 		require PublicInbox::Gcf2Client;
 		PublicInbox::Gcf2Client::new();
 	} // 0)) { # 0: do not retry if libgit2 or Inline::C are missing
 		$GCF2C->gcf2_async("$oid $git->{git_dir}\n", $cb, $arg);
-		\undef;
+		return \undef;
 	} else { # read-only end of git-cat-file pipe
 		$git->cat_async($oid, $cb, $arg);
 		$git->watch_async;

                 reply	other threads:[~2023-11-30  9:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231130095639.372344-1-e@80x24.org \
    --to=e@80x24.org \
    --cc=spew@80x24.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).