Skip to content

Commit

Permalink
git-svn: don't attempt to spawn pager if we don't want one
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Sep 24, 2007
1 parent 822f7c7 commit b019304
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit b019304

Please sign in to comment.