about summary refs log tree commit homepage
path: root/lib
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2014-04-30 00:14:35 +0000
committerEric Wong <e@80x24.org>2014-04-30 00:14:35 +0000
commit5fcdd26007a699e3eeee066d87aa879de51466a9 (patch)
tree5878823c8e3c4ce2c7de4839205f78102f882d61 /lib
parentd47ac116dde198c610fdb6e03c48e9980071aa3d (diff)
downloadpublic-inbox-5fcdd26007a699e3eeee066d87aa879de51466a9.tar.gz
This should elimate all of our %ENV dependencies in the WWW portion
of our code.
Diffstat (limited to 'lib')
-rw-r--r--lib/PublicInbox/Feed.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index ad058395..d535cea9 100644
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -23,7 +23,6 @@ sub generate {
         require POSIX;
         my $max = $args->{max} || MAX_PER_PAGE;
 
-        local $ENV{GIT_DIR} = $args->{git_dir};
         my $feed_opts = get_feedopts($args);
         my $addr = $feed_opts->{address};
         $addr = $addr->[0] if ref($addr);
@@ -52,7 +51,6 @@ sub generate_html_index {
         require Mail::Thread;
 
         my $max = $args->{max} || MAX_PER_PAGE;
-        local $ENV{GIT_DIR} = $args->{git_dir};
         my $feed_opts = get_feedopts($args);
 
         my $title = $feed_opts->{description} || '';
@@ -130,7 +128,8 @@ sub each_recent_blob {
         # get recent messages
         # we could use git log -z, but, we already know ssoma will not
         # leave us with filenames with spaces in them..
-        my @cmd = qw/git log --no-notes --no-color --raw -r/;
+        my @cmd = ('git', "--git-dir=$args->{git_dir}",
+                        qw/log --no-notes --no-color --raw -r/);
         push @cmd, $range;
 
         my $pid = open(my $log, '-|', @cmd) or