git-merge: add --ff and --no-ff options

[git.git] / git-svn.perl

diff --git a/git-svn.perl b/git-svn.perl
index 288d32cb160fcf1b7fdb8bbce9d800d971ced345..484b0576a8cdea3b0d2063ce73c8b8cb11a18f7c 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3578,7 +3578,7 @@ sub config_pager {
 }
 
 sub run_pager {
-       return unless -t *STDOUT;
+       return unless -t *STDOUT && defined $pager;
        pipe my $rfd, my $wfd or return;
        defined(my $pid = fork) or ::fatal "Can't fork: $!\n";
        if (!$pid) {