From: Eric Wong <e@80x24.org>
Date: Tue, 9 Jan 2024 11:39:23 +0000 (+0000)
Subject: git: workaround occasional -watch error message
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3991bba13a63a40391cfcdeace638a50bcc1c0c;p=thirdparty%2Fpublic-inbox.git

git: workaround occasional -watch error message

I'm not sure how this happens (perl 5.34.1 on FreeBSD 13.2)
but it appears the {sock} check can succeed and then go undef
and become unable to call ->owner_pid.

This happens when libgit2 is in use, so perhaps that's a factor.
In any case, the rest of the tests succeed.
---

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 6c4fcf932..7b991c6b3 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -208,8 +208,17 @@ sub cat_async_retry ($$) {
 
 sub gcf_inflight ($) {
 	my ($self) = @_;
+	# FIXME: the first {sock} check can succeed but Perl can complain
+	# about calling ->owner_pid on an undefined value.  Not sure why or
+	# how this happens but t/imapd.t can complain about it, sometimes.
 	if ($self->{sock}) {
-		return $self->{inflight} if $self->{sock}->owner_pid == $$;
+		if (eval { $self->{sock}->owner_pid == $$ }) {
+			return $self->{inflight};
+		} elsif ($@) {
+			no warnings 'uninitialized';
+			warn "E: $self sock=$self->{sock}: owner_pid failed: ".
+				"$@ (continuing...)";
+		}
 		delete @$self{qw(sock inflight)};
 	} else {
 		$self->close;