user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] git: use core.abbrev=no on git 2.31+
Date: Wed, 25 Jan 2023 10:18:32 +0000	[thread overview]
Message-ID: <20230125101835.882567-2-e@80x24.org> (raw)
In-Reply-To: <20230125101835.882567-1-e@80x24.org>

This makes it easier to support SHA-256 inboxes in the future.
Tested with both git 2.30.2 (Debian stable) and 2.39.1
---
 lib/PublicInbox/Git.pm | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index c9ed48be..ff3ac40f 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -16,7 +16,7 @@ use Errno qw(EINTR EAGAIN ENOENT);
 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);
@@ -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,8 +148,8 @@ 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): $!");

  reply	other threads:[~2023-01-25 10:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-25 10:18 [PATCH 0/4] git-related updates Eric Wong
2023-01-25 10:18 ` Eric Wong [this message]
2023-01-25 10:18 ` [PATCH 2/4] process_pipe: warn hackers off using it for bidirectional pipes Eric Wong
2023-01-25 10:18 ` [PATCH 3/4] git: drop needless ENOENT import Eric Wong
2023-01-25 10:18 ` [PATCH 4/4] git: reduce delete ops in _destroy Eric Wong

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

  List information: https://public-inbox.org/README

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

  git send-email \
    --in-reply-to=20230125101835.882567-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

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).