mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
b4479f0747
commit
dec543e62d
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue