X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=4078dd5b7cfe79f8bf1c0d29cfbe4b3cba35aae5;hb=48af2131c7ef0e7001f99fe3c2dabd1713d3e800;hp=016dd2ae30e93833eb356abf35ae9ec7f6002e01;hpb=ac474b431a77107fe8994c94806864bab2bc7fa9;p=public-inbox.git

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 016dd2ae..4078dd5b 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -114,7 +114,7 @@ sub _bidi_pipe {
 		return;
 	}
 	pipe(my ($out_r, $out_w)) or $self->fail("pipe failed: $!");
-	my $rdr = { 0 => $out_r };
+	my $rdr = { 0 => $out_r, pgid => 0 };
 	my $gd = $self->{git_dir};
 	if ($gd =~ s!/([^/]+/[^/]+)\z!/!) {
 		$rdr->{-C} = $gd;
@@ -158,7 +158,8 @@ sub my_read ($$$) {
 			return; # unrecoverable error
 		}
 	}
-	\substr($$rbuf, 0, $len, '');
+	my $no_pad = substr($$rbuf, 0, $len, '');
+	\$no_pad;
 }
 
 sub my_readline ($$) {
@@ -179,8 +180,8 @@ sub my_readline ($$) {
 	}
 }
 
-sub cat_async_retry ($$$$$) {
-	my ($self, $inflight, $req, $cb, $arg) = @_;
+sub cat_async_retry ($$) {
+	my ($self, $inflight) = @_;
 
 	# {inflight} may be non-existent, but if it isn't we delete it
 	# here to prevent cleanup() from waiting:
@@ -189,12 +190,13 @@ sub cat_async_retry ($$$$$) {
 
 	$self->{inflight} = $inflight;
 	batch_prepare($self);
-	my $buf = "$req\n";
+	my $buf = '';
 	for (my $i = 0; $i < @$inflight; $i += 3) {
 		$buf .= "$inflight->[$i]\n";
 	}
 	print { $self->{out} } $buf or $self->fail("write error: $!");
-	unshift(@$inflight, \$req, $cb, $arg); # \$ref to indicate retried
+	my $req = shift @$inflight;
+	unshift(@$inflight, \$req); # \$ref to indicate retried
 
 	cat_async_step($self, $inflight); # take one step
 }
@@ -202,7 +204,7 @@ sub cat_async_retry ($$$$$) {
 sub cat_async_step ($$) {
 	my ($self, $inflight) = @_;
 	die 'BUG: inflight empty or odd' if scalar(@$inflight) < 3;
-	my ($req, $cb, $arg) = splice(@$inflight, 0, 3);
+	my ($req, $cb, $arg) = @$inflight[0, 1, 2];
 	my $rbuf = delete($self->{rbuf}) // \(my $new = '');
 	my ($bref, $oid, $type, $size);
 	my $head = my_readline($self->{in}, $rbuf);
@@ -217,8 +219,7 @@ sub cat_async_step ($$) {
 		# ref($req) indicates it's already been retried
 		# -gcf2 retries internally, so it never hits this path:
 		if (!ref($req) && !$in_cleanup && $self->alternates_changed) {
-			return cat_async_retry($self, $inflight,
-						$req, $cb, $arg);
+			return cat_async_retry($self, $inflight);
 		}
 		$type = 'missing';
 		$oid = ref($req) ? $$req : $req if $oid eq '';
@@ -227,6 +228,7 @@ sub cat_async_step ($$) {
 		$self->fail("bad result from async cat-file: $head$err");
 	}
 	$self->{rbuf} = $rbuf if $$rbuf ne '';
+	splice(@$inflight, 0, 3); # don't retry $cb on ->fail
 	eval { $cb->($bref, $oid, $type, $size, $arg) };
 	async_err($self, $req, $oid, $@, 'cat') if $@;
 }
@@ -259,7 +261,7 @@ sub cat_file {
 sub check_async_step ($$) {
 	my ($self, $inflight_c) = @_;
 	die 'BUG: inflight empty or odd' if scalar(@$inflight_c) < 3;
-	my ($req, $cb, $arg) = splice(@$inflight_c, 0, 3);
+	my ($req, $cb, $arg) = @$inflight_c[0, 1, 2];
 	my $rbuf = delete($self->{rbuf_c}) // \(my $new = '');
 	chomp(my $line = my_readline($self->{in_c}, $rbuf));
 	my ($hex, $type, $size) = split(/ /, $line);
@@ -273,6 +275,7 @@ sub check_async_step ($$) {
 		$self->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret;
 	}
 	$self->{rbuf_c} = $rbuf if $$rbuf ne '';
+	splice(@$inflight_c, 0, 3); # don't retry $cb on ->fail
 	eval { $cb->($hex, $type, $size, $arg, $self) };
 	async_err($self, $req, $hex, $@, 'check') if $@;
 }
@@ -440,13 +443,8 @@ sub packed_bytes {
 sub DESTROY { cleanup(@_) }
 
 sub local_nick ($) {
-	my ($self) = @_;
-	my $ret = '???';
 	# don't show full FS path, basename should be OK:
-	if ($self->{git_dir} =~ m!/([^/]+)(?:/*\.git/*)?\z!) {
-		$ret = "$1.git";
-	}
-	wantarray ? ($ret) : $ret;
+	$_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? "$1.git" : '???';
 }
 
 sub host_prefix_url ($$) {
@@ -463,7 +461,7 @@ sub pub_urls {
 	if (my $urls = $self->{cgit_url}) {
 		return map { host_prefix_url($env, $_) } @$urls;
 	}
-	local_nick($self);
+	(local_nick($self));
 }
 
 sub cat_async_begin {