summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-09-22 01:48:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-09-24 00:07:10 (GMT)
commitb019304886c2f5d702988e8f8bd86a1b621183c6 (patch)
treeba62148cddfa0590c55be048a4a993ad3201a2fd
parent822f7c7349d61f6075961ce42c1bd1a85cf999e5 (diff)
downloadgit-b019304886c2f5d702988e8f8bd86a1b621183c6.zip
git-b019304886c2f5d702988e8f8bd86a1b621183c6.tar.gz
git-b019304886c2f5d702988e8f8bd86a1b621183c6.tar.bz2
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-xgit-svn.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl
index f818160..c015ea8 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) {