summaryrefslogtreecommitdiff
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-10-30 20:43:19 -0500
committerJunio C Hamano <gitster@pobox.com>2009-11-13 12:20:52 -0800
commitdec543e62dbc47be0c06805330a20f7fa9f699a3 (patch)
tree5fb0e263b8ba9cbcfab0253a095271bc41f2fa19 /git-svn.perl
parentb4479f074760a788dd4e353b8c86a7d735afc53e (diff)
downloadgit-dec543e62dbc47be0c06805330a20f7fa9f699a3.tar.gz
am -i, git-svn: use "git var GIT_PAGER"
Use the new "git var GIT_PAGER" command to ask what pager to use. Without this change, the core.pager configuration is ignored by these commands. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-svn.perl')
-rwxr-xr-xgit-svn.perl6
1 files changed, 2 insertions, 4 deletions
diff --git a/git-svn.perl b/git-svn.perl
index 42c9a728ad..c4ca5487f3 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5171,10 +5171,8 @@ sub git_svn_log_cmd {
# adapted from pager.c
sub config_pager {
- $pager ||= $ENV{GIT_PAGER} || $ENV{PAGER};
- if (!defined $pager) {
- $pager = 'less';
- } elsif (length $pager == 0 || $pager eq 'cat') {
+ chomp(my $pager = command_oneline(qw(var GIT_PAGER)));
+ if ($pager eq 'cat') {
$pager = undef;
}
$ENV{GIT_PAGER_IN_USE} = defined($pager);