git: support arbitrary redirects and env settings on popen

We want to be able to redirect stderr to a temporary file
while using the normal popen interface in our Git.pm.

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 23a3e6c7bdf36fba1f908613eadd03e4fb56940b..bd945007fdad4ae7efdc4d746b144226641c42b2 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -132,8 +132,16 @@ sub fail {
 
 sub popen {
        my ($self, @cmd) = @_;
-       @cmd = ('git', "--git-dir=$self->{git_dir}", @cmd);
-       popen_rd(\@cmd);
+       my $cmd = [ 'git', "--git-dir=$self->{git_dir}" ];
+       my ($env, $opt);
+       if (ref $cmd[0]) {
+               push @$cmd, @{$cmd[0]};
+               $env = $cmd[1];
+               $opt = $cmd[2];
+       } else {
+               push @$cmd, @cmd;
+       }
+       popen_rd($cmd, $env, $opt);
 }
 
 sub qx {