X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=12f997dc147ec80278392aa7cf088ef59d30ce26;hb=cc37f7c9858d46638a0eea7333912f74c05cb708;hp=d8468b4fb381a16173b6459c68b23e28f1fa7b29;hpb=a0646591eacd2403476545ac4569bd7c551e67cf;p=public-inbox.git

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index d8468b4f..12f997dc 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -12,16 +12,16 @@ use v5.10.1;
 use parent qw(Exporter);
 use POSIX ();
 use IO::Handle; # ->autoflush
-use Errno qw(EINTR EAGAIN ENOENT);
+use Errno qw(EINTR EAGAIN);
 use File::Glob qw(bsd_glob GLOB_NOSORT);
 use File::Spec ();
 use Time::HiRes qw(stat);
-use PublicInbox::Spawn qw(popen_rd spawn);
+use PublicInbox::Spawn qw(popen_rd which);
 use PublicInbox::Tmpfile;
 use IO::Poll qw(POLLIN);
 use Carp qw(croak carp);
 use Digest::SHA ();
-use PublicInbox::DS qw(dwaitpid);
+use PublicInbox::DS qw(awaitpid);
 our @EXPORT_OK = qw(git_unquote git_quote);
 our $PIPE_BUFSIZ = 65536; # Linux default
 our $in_cleanup;
@@ -46,7 +46,6 @@ my %GIT_ESC = (
 );
 my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC;
 
-
 # unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git
 sub git_unquote ($) {
 	return $_[0] unless ($_[0] =~ /\A"(.*)"\z/);
@@ -122,6 +121,26 @@ sub _bidi_pipe {
 		}
 		return;
 	}
+
+	state $EXE_ST = ''; # pack('dd', st_ctime, st_size);
+	my $exe = which('git') // die "git not found in $ENV{PATH}";
+	my @st = stat($exe) or die "stat: $!";
+	my $st = pack('dd', $st[10], $st[7]);
+	state $VER;
+	if ($st ne $EXE_ST) {
+		my $rd = popen_rd([ $exe, '--version' ]);
+		my $v = readline($rd);
+		$v =~ /\b([0-9]+(?:\.[0-9]+){2})/ or die
+			"$exe --version output: $v # unparseable";
+		my @v = split(/\./, $1, 3);
+		$VER = ($v[0] << 24) | ($v[1] << 16) | $v[2];
+		$EXE_ST = $st;
+	}
+
+	# git 2.31.0+ supports -c core.abbrev=no, don't bother with
+	# core.abbrev=64 since not many releases had SHA-256 prior to 2.31
+	my $abbr = $VER < (2 << 24 | 31 << 16) ? 40 : 'no';
+
 	pipe(my ($out_r, $out_w)) or $self->fail("pipe failed: $!");
 	my $rdr = { 0 => $out_r, pgid => 0 };
 	my $gd = $self->{git_dir};
@@ -129,16 +148,17 @@ sub _bidi_pipe {
 		$rdr->{-C} = $gd;
 		$gd = $1;
 	}
-	my @cmd = (qw(git), "--git-dir=$gd",
-			qw(-c core.abbrev=40 cat-file), $batch);
+	my @cmd = ($exe, "--git-dir=$gd", '-c', "core.abbrev=$abbr",
+			'cat-file', $batch);
 	if ($err) {
 		my $id = "git.$self->{git_dir}$batch.err";
 		my $fh = tmpfile($id) or $self->fail("tmpfile($id): $!");
 		$self->{$err} = $fh;
 		$rdr->{2} = $fh;
 	}
+	# see lib/PublicInbox/ProcessPipe.pm for why we don't use that here
 	my ($in_r, $p) = popen_rd(\@cmd, undef, $rdr);
-	$self->{$pid} = $p;
+	awaitpid($self->{$pid} = $p, undef);
 	$self->{"$pid.owner"} = $$;
 	$out_w->autoflush(1);
 	if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
@@ -353,13 +373,11 @@ sub check {
 }
 
 sub _destroy {
-	my ($self, $rbuf, $in, $out, $pid, $err) = @_;
-	delete @$self{($rbuf, $in, $out)};
-	delete $self->{$err} if $err; # `err_c'
+	my ($self, $pid, @rest) = @_; # rest = rbuf, in, out, err
+	my ($p) = delete @$self{($pid, @rest)};
 
-	# GitAsyncCat::event_step may delete {pid}
-	my $p = delete $self->{$pid} or return;
-	dwaitpid($p) if $$ == $self->{"$pid.owner"};
+	# GitAsyncCat::event_step may delete {$pid}
+	awaitpid($p) if defined($p) && $$ == $self->{"$pid.owner"};
 }
 
 sub async_abort ($) {
@@ -448,8 +466,8 @@ sub cleanup {
 	async_wait_all($self);
 	delete $self->{inflight};
 	delete $self->{inflight_c};
-	_destroy($self, qw(rbuf in out pid));
-	_destroy($self, qw(rbuf_c in_c out_c pid_c err_c));
+	_destroy($self, qw(pid rbuf in out));
+	_destroy($self, qw(pid_c rbuf_c in_c out_c err_c));
 	undef;
 }
 
@@ -485,10 +503,11 @@ sub host_prefix_url ($$) {
 
 sub base_url { # for coderepos, PSGI-only
 	my ($self, $env) = @_; # env - PSGI env
+	my $nick = $self->{nick} // return undef;
 	my $url = host_prefix_url($env, '');
 	# for mount in Plack::Builder
 	$url .= '/' if substr($url, -1, 1) ne '/';
-	$url . $self->{nick} . '/';
+	$url . $nick . '/';
 }
 
 sub isrch {} # TODO
@@ -496,9 +515,10 @@ sub isrch {} # TODO
 sub pub_urls {
 	my ($self, $env) = @_;
 	if (my $urls = $self->{cgit_url}) {
-		return map { host_prefix_url($env, $_) } @$urls;
+		map { host_prefix_url($env, $_) } @$urls;
+	} else {
+		(base_url($self, $env) // '???');
 	}
-	(local_nick($self) // '???');
 }
 
 sub cat_async_begin {