Merge branch 'maint'

diff --git a/git-svn.perl b/git-svn.perl
index 49dd649bc562ac1b8e5da708ba91572b5e0f0c11..b7c03b641cc3d38a0e619b4843d6309413eb4903 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5465,7 +5465,12 @@ sub git_svn_log_cmd {
 
 # adapted from pager.c
 sub config_pager {
-       chomp(my $pager = command_oneline(qw(var GIT_PAGER)));
+       if (! -t *STDOUT) {
+               $ENV{GIT_PAGER_IN_USE} = 'false';
+               $pager = undef;
+               return;
+       }
+       chomp($pager = command_oneline(qw(var GIT_PAGER)));
        if ($pager eq 'cat') {
                $pager = undef;
        }
@@ -5473,7 +5478,7 @@ sub config_pager {
 }
 
 sub run_pager {
-       return unless -t *STDOUT && defined $pager;
+       return unless defined $pager;
        pipe my ($rfd, $wfd) or return;
        defined(my $pid = fork) or ::fatal "Can't fork: $!";
        if (!$pid) {