undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git svn: Fix launching of pager

Browse Source 
In commit dec543e (am -i, git-svn: use "git var GIT_PAGER"), I tried
to teach git svn to defer to git var on what pager to use. In the
process, I introduced two bugs:

 - The value set for $pager in config_pager has local scope, so
   run_pager never sees it;

 - git var cannot tell whether git svn’s output is going to a
   terminal, so the value chosen for $pager does not reflect that
   information.

Fix them.

Reported-by: Sebastian Celis <sebastian@sebastiancelis.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-02-14 06:06:10 -06:00 committed by Junio C Hamano
parent 06300d9753
commit 190c1cda7e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git-svn.perl
View File

@ -5459,7 +5459,12 @@ sub git_svn_log_cmd {
# adapted from pager.c # adapted from pager.c
sub config_pager { 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') { if ($pager eq 'cat') {
$pager = undef; $pager = undef;
} }
@ -5467,7 +5472,7 @@ sub config_pager {
} }
sub run_pager { sub run_pager {
return unless -t *STDOUT && defined $pager; return unless defined $pager;
pipe my ($rfd, $wfd) or return; pipe my ($rfd, $wfd) or return;
defined(my $pid = fork) or ::fatal "Can't fork: $!"; defined(my $pid = fork) or ::fatal "Can't fork: $!";
if (!$pid) { if (!$pid) {