diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2009-10-30 20:43:19 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-13 12:20:52 -0800 |
| commit | dec543e62dbc47be0c06805330a20f7fa9f699a3 (patch) | |
| tree | 5fb0e263b8ba9cbcfab0253a095271bc41f2fa19 | |
| parent | b4479f074760a788dd4e353b8c86a7d735afc53e (diff) | |
| download | git-dec543e62dbc47be0c06805330a20f7fa9f699a3.tar.gz git-dec543e62dbc47be0c06805330a20f7fa9f699a3.tar.xz | |
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>
| -rwxr-xr-x | git-am.sh | 5 | ||||
| -rwxr-xr-x | git-svn.perl | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -649,7 +649,10 @@ do [eE]*) git_editor "$dotest/final-commit" action=again ;; [vV]*) action=again - LESS=-S ${PAGER:-less} "$dotest/patch" ;; + : ${GIT_PAGER=$(git var GIT_PAGER)} + : ${LESS=-FRSX} + export LESS + $GIT_PAGER "$dotest/patch" ;; *) action=again ;; esac done diff --git a/git-svn.perl b/git-svn.perl index 42c9a728a..c4ca5487f 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); |