diff options
author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2014-04-30 09:35:25 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-05-07 13:41:04 -0700 |
commit | b3275838d969b7ecb91aae584226fccbeb046aca (patch) | |
tree | 2906218b9707f42caa5eaf7a1f1bae512fad35d6 /perl/Git/SVN/Log.pm | |
parent | Merge branch 'db/make-with-curl' (diff) | |
download | tgif-b3275838d969b7ecb91aae584226fccbeb046aca.tar.xz |
pager: remove 'S' from $LESS by default
By default, Git used to set $LESS to -FRSX if $LESS was not set by
the user. The FRX flags actually make sense for Git (F and X because
sometimes the output Git pipes to less is short, and R because Git
pipes colored output). The S flag (chop long lines), on the other
hand, is not related to Git and is a matter of user preference. Git
should not decide for the user to change LESS's default.
More specifically, the S flag harms users who review untrusted code
within a pager, since a patch looking like:
-old code;
+new good code; [... lots of tabs ...] malicious code;
would appear identical to:
-old code;
+new good code;
Users who prefer the old behavior can still set the $LESS environment
variable to -FRSX explicitly, or set core.pager to 'less -S'.
The documentation in config.txt is made a bit longer to keep both an
example setting the 'S' flag (needed to recover the old behavior)
and an example showing how to unset a flag set by Git.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'perl/Git/SVN/Log.pm')
-rw-r--r-- | perl/Git/SVN/Log.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm index 34f2869ab5..664105357c 100644 --- a/perl/Git/SVN/Log.pm +++ b/perl/Git/SVN/Log.pm @@ -116,7 +116,7 @@ sub run_pager { return; } open STDIN, '<&', $rfd or fatal "Can't redirect stdin: $!"; - $ENV{LESS} ||= 'FRSX'; + $ENV{LESS} ||= 'FRX'; $ENV{LV} ||= '-c'; exec $pager or fatal "Can't run pager: $! ($pager)"; } |