git: rename version() to git_version()

In case it gets confused with Inbox->version or similar.

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index cc337e5d3ae0bad59019a5c8380d69941bdc6143..fd5bbc6b57ae2236acc88d9af674c890c85e0f86 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -52,11 +52,6 @@ my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC;
 my $EXE_ST = ''; # pack('dd', st_ctime, st_size);
 my ($GIT_EXE, $GIT_VER);
 
-sub version {
-       check_git_exe();
-       $GIT_VER;
-}
-
 sub check_git_exe () {
        $GIT_EXE = which('git') // die "git not found in $ENV{PATH}";
        my @st = stat($GIT_EXE) or die "stat: $!";
@@ -72,6 +67,11 @@ sub check_git_exe () {
        }
 }
 
+sub git_version {
+       check_git_exe();
+       $GIT_VER;
+}
+
 # unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git
 sub git_unquote ($) {
        return $_[0] unless ($_[0] =~ /\A"(.*)"\z/);

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 8f74968863b15b424d33624b1d3ebcbe9f3a6271..bed034f1ab5289efb55bfa5fcdcf76eca9d7f8d0 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() ge v2.29.0 and
+       PublicInbox::Git::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 aa2abc433ceb09ffe7dec57e3afc697addbc3e59..ddee58b1ee853d240b589b279140bcb167a0690f 100644 (file)
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -111,7 +111,7 @@ sub have_xapian_compact (;$) {
 sub require_git ($;$) {
        my ($req, $nr) = @_;
        require PublicInbox::Git;
-       state $cur_vstr = PublicInbox::Git::version();
+       state $cur_vstr = PublicInbox::Git::git_version();
        $req = eval("v$req") unless isvstring($req);
 
        return 1 if $cur_vstr ge $req;