diff options
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/Git.pm | 10 | ||||
-rw-r--r-- | lib/PublicInbox/LeiMirror.pm | 2 | ||||
-rw-r--r-- | lib/PublicInbox/TestCommon.pm | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index cc337e5d..fd5bbc6b 100644 --- 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 8f749688..bed034f1 100644 --- 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 aa2abc43..ddee58b1 100644 --- 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; |