about summary refs log tree commit homepage
path: root/lib/PublicInbox/Git.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-10-27 22:21:10 +0000
committerEric Wong <e@80x24.org>2023-10-28 09:08:16 +0000
commite57a3412a379ff57ba7d5cfaf609ffeec6e04f71 (patch)
tree592f4b2f86ed78bdf03954bc576a2de269fc28e4 /lib/PublicInbox/Git.pm
parent76ede1996b9d1e4317710be3a9669c51582c298b (diff)
downloadpublic-inbox-e57a3412a379ff57ba7d5cfaf609ffeec6e04f71.tar.gz
It exists, now, so save us a few lines of code.
Diffstat (limited to 'lib/PublicInbox/Git.pm')
-rw-r--r--lib/PublicInbox/Git.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f4a24f2a..b5adc1f4 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -18,7 +18,7 @@ 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(spawn popen_rd which);
+use PublicInbox::Spawn qw(spawn popen_rd run_qx which);
 use PublicInbox::ProcessIONBF;
 use PublicInbox::Tmpfile;
 use IO::Poll qw(POLLIN);
@@ -61,9 +61,8 @@ sub check_git_exe () {
         my @st = stat($GIT_EXE) or die "stat($GIT_EXE): $!";
         my $st = pack('dd', $st[10], $st[7]);
         if ($st ne $EXE_ST) {
-                my $rd = popen_rd([ $GIT_EXE, '--version' ]);
-                my $v = readline($rd);
-                CORE::close($rd) or die "$GIT_EXE --version: $?";
+                my $v = run_qx([ $GIT_EXE, '--version' ]);
+                die "$GIT_EXE --version: \$?=$?" if $?;
                 $v =~ /\b([0-9]+(?:\.[0-9]+){2})/ or die
                         "$GIT_EXE --version output: $v # unparseable";
                 $GIT_VER = eval("v$1") // die "BUG: bad vstring: $1 ($v)";