switch git version comparisons to vstrings, too

There's too many require_git callsites in t/*.t to change,
but we can make the rest of the code more readable and reuse
PublicInbox::Git::version() in our test suite, too.

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 6f8232cfdb3129ad0362fae8f2889bae77d7012b..e35d52778a553b51213254ffa2461f89a7dbeed9 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -33,7 +33,7 @@ our $async_warn; # true in read-only daemons
 # 65: SHA-256 hex size + "\n" in preparation for git using non-SHA1
 use constant {
        MAX_INFLIGHT => 512 * 3 / (65 + length('contents ')),
-       BATCH_CMD_VER => (2 << 24 | 36 << 16), # git 2.36+
+       BATCH_CMD_VER => v2.36.0, # git 2.36+
 };
 
 my %GIT_ESC = (
@@ -67,8 +67,7 @@ sub check_git_exe () {
                close($rd) or die "$GIT_EXE --version: $?";
                $v =~ /\b([0-9]+(?:\.[0-9]+){2})/ or die
                        "$GIT_EXE --version output: $v # unparseable";
-               my @v = split(/\./, $1, 3);
-               $GIT_VER = ($v[0] << 24) | ($v[1] << 16) | $v[2];
+               $GIT_VER = eval("v$1") // die "BUG: bad vstring: $1 ($v)";
                $EXE_ST = $st;
        }
 }
@@ -159,7 +158,7 @@ sub _bidi_pipe {
 
        # 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 = $GIT_VER < (2 << 24 | 31 << 16) ? 40 : 'no';
+       my $abbr = $GIT_VER lt v2.31.0 ? 40 : 'no';
        my @cmd = ($GIT_EXE, "--git-dir=$gd", '-c', "core.abbrev=$abbr",
                        'cat-file', "--$batch");
        if ($err) {
@@ -316,7 +315,7 @@ sub cat_async_wait ($) {
 sub batch_prepare ($) {
        my ($self) = @_;
        check_git_exe();
-       if ($GIT_VER >= BATCH_CMD_VER) {
+       if ($GIT_VER ge BATCH_CMD_VER) {
                _bidi_pipe($self, qw(batch-command in out pid err_c));
                $self->{-bc} = 1;
        } else {
@@ -370,7 +369,7 @@ sub check_async_begin ($) {
        die 'BUG: already in async check' if $self->{inflight_c};
        cleanup($self) if alternates_changed($self);
        check_git_exe();
-       if ($GIT_VER >= BATCH_CMD_VER) {
+       if ($GIT_VER ge BATCH_CMD_VER) {
                _bidi_pipe($self, qw(batch-command in out pid err_c));
                $self->{-bc} = 1;
                $self->{inflight} = [];

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index e0709fbdedf01774e44632e525d67be866aa8845..8f74968863b15b424d33624b1d3ebcbe9f3a6271 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -276,7 +276,7 @@ sub fetch_args ($$) {
                        ($lei->{opt}->{jobs} // 1) > 1;
        push @cmd, '-v' if $lei->{opt}->{verbose};
        push(@cmd, '-p') if $lei->{opt}->{prune};
-       PublicInbox::Git::version() >= ((2 << 24) | (29 << 16)) and
+       PublicInbox::Git::version() ge v2.29.0 and
                push(@cmd, '--no-write-fetch-head');
        @cmd;
 }

diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index 494323c044e46219f87bc60b36315a27f61925a8..aa2abc433ceb09ffe7dec57e3afc697addbc3e59 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -10,6 +10,7 @@ use Fcntl qw(F_SETFD :seek);
 use POSIX qw(dup2);
 use IO::Socket::INET;
 use File::Spec;
+use Scalar::Util qw(isvstring);
 our @EXPORT;
 my $lei_loud = $ENV{TEST_LEI_ERR_LOUD};
 my $tail_cmd = $ENV{TAIL};
@@ -109,17 +110,12 @@ sub have_xapian_compact (;$) {
 
 sub require_git ($;$) {
        my ($req, $nr) = @_;
-       state ($cur_int, $cur_ver);
-       $cur_int //= do {
-               chomp($cur_ver = xqx([qw(git --version)]));
-               my @v = ($cur_ver =~ /version (\d+)\.(\d+)(?:\.(\d+))?/);
-               ($v[0] << 24) | ($v[1] << 16) | ($v[2] // 0);
-       };
-
-       my ($req_maj, $req_min, $req_sub) = split(/\./, $req);
-       my $req_int = ($req_maj << 24) | ($req_min << 16) | ($req_sub // 0);
+       require PublicInbox::Git;
+       state $cur_vstr = PublicInbox::Git::version();
+       $req = eval("v$req") unless isvstring($req);
 
-       return 1 if $cur_int >= $req_int;
+       return 1 if $cur_vstr ge $req;
+       state $cur_ver = sprintf('%vd', $cur_vstr);
        return plan skip_all => "git $req+ required, have $cur_ver" if !$nr;
        defined(wantarray) ? undef :
                skip("git $req+ required (have $cur_ver), skipping $nr tests")