From d47ac116dde198c610fdb6e03c48e9980071aa3d Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 29 Apr 2014 05:33:45 +0000 Subject: cgi: mid2blob does not depend on $ENV{GIT_DIR} ENV changes do not propagate to child processes under mod_perl --- public-inbox.cgi | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public-inbox.cgi b/public-inbox.cgi index ffd6ec08..6f20e145 100755 --- a/public-inbox.cgi +++ b/public-inbox.cgi @@ -142,12 +142,16 @@ sub get_index { # just returns a string ref for the blob in the current ctx sub mid2blob { my ($ctx) = @_; - local $ENV{GIT_DIR} = $ctx->{git_dir}; require Digest::SHA; my $hex = Digest::SHA::sha1_hex($ctx->{mid}); $hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/i or die "BUG: not a SHA-1 hex: $hex"; - my $blob = `git cat-file blob HEAD:$1/$2 2>/dev/null`; + require IPC::Run; + my ($in, $blob, $err); + open my $null, '+<', '/dev/null' or die "open: $!\n"; + IPC::Run::run(['git', '--git-dir', $ctx->{git_dir}, + qw(cat-file blob), "HEAD:$1/$2"], + $null, \$blob, $null); $? == 0 ? \$blob : undef; } -- cgit v1.2.3-24-ge0c7