diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-09-21 18:48:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-23 17:07:10 -0700 |
| commit | b019304886c2f5d702988e8f8bd86a1b621183c6 (patch) | |
| tree | ba62148cddfa0590c55be048a4a993ad3201a2fd | |
| parent | 822f7c7349d61f6075961ce42c1bd1a85cf999e5 (diff) | |
| download | git-b019304886c2f5d702988e8f8bd86a1b621183c6.tar.gz git-b019304886c2f5d702988e8f8bd86a1b621183c6.tar.xz | |
git-svn: don't attempt to spawn pager if we don't want one
Even though config_pager() unset the $pager variable, we were
blindly calling exec() on it through run_pager().
Noticed-by: Chris Moore <christopher.ian.moore@gmail.com>
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index f8181609f..c015ea858 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3576,7 +3576,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) { |