about summary refs log tree commit homepage
path: root/lib/PublicInbox/Admin.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox/Admin.pm')
-rw-r--r--lib/PublicInbox/Admin.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index a1b1fc07..bb5d3653 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -11,6 +11,7 @@ use PublicInbox::Config;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(run_qx);
 use PublicInbox::Eml;
+use PublicInbox::Git qw(git_exe);
 *rel2abs_collapsed = \&PublicInbox::Config::rel2abs_collapsed;
 
 sub setup_signals {
@@ -77,7 +78,7 @@ sub resolve_git_dir {
         my $env;
         defined($pwd) && substr($cd // '/', 0, 1) ne '/' and
                 $env->{PWD} = "$pwd/$cd";
-        my $cmd = [ qw(git rev-parse --git-dir) ];
+        my $cmd = [ git_exe, qw(rev-parse --git-dir) ];
         my $dir = run_qx($cmd, $env, { -C => $cd });
         die "error in @$cmd (cwd:${\($cd // '.')}): $?\n" if $?;
         chomp $dir;
@@ -317,7 +318,7 @@ sub progress_prepare ($;$) {
                 $opt->{1} = $null; # suitable for spawn() redirect
         } else {
                 $opt->{verbose} ||= 1;
-                $dst //= *STDERR{GLOB};
+                $dst //= \*STDERR;
                 $opt->{-progress} = sub { print $dst '# ', @_ };
         }
 }