[PATCH] PAGER_ENV: remove 'S' from $LESS by default
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Apr 28, 2014, 08:34 UTC
- Message-ID
- <1398674062-24288-1-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <20140425154722.GC11479@google.com>
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 Git sometimes pipes short output to less, 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> ---
> We agree here. So, does someone who actually wants this change want to > propose a patch? :)
Here you are.
Documentation/config.txt | 13 ++++++++----- Makefile | 6 +++--- perl/Git/SVN/Log.pm | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index e30561d..b7f92ac 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -560,14 +560,17 @@ core.pager:: configuration, then `$PAGER`, and then the default chosen at compile time (usually 'less'). + -When the `LESS` environment variable is unset, Git sets it to `FRSX` +When the `LESS` environment variable is unset, Git sets it to `FRX` (if `LESS` environment variable is set, Git does not change it at all). If you want to selectively override Git's default setting -for `LESS`, you can set `core.pager` to e.g. `less -+S`. This will +for `LESS`, you can set `core.pager` to e.g. `less -S`. This will be passed to the shell by Git, which will translate the final -command to `LESS=FRSX less -+S`. The environment tells the command -to set the `S` option to chop long lines but the command line -resets it to the default to fold long lines. +command to `LESS=FRX less -S`. The environment does not set the +`S` option but the command line does, instructing less to truncate +long lines. Similarly, setting `core.pager` to `less -+F` will +deactivate the `F` option specified by the environment from the +command-line, deactivating the "quit if one screen" behavior of +`less`. + Likewise, when the `LV` environment variable is unset, Git sets it to `-c`. You can override this setting by exporting `LV` with diff --git a/Makefile b/Makefile index a3b298e..cd3cdf6 100644 --- a/Makefile +++ b/Makefile @@ -344,9 +344,9 @@ all:: # Define PAGER_ENV to a SP separated VAR=VAL pairs to define # default environment variables to be passed when a pager is spawned, e.g. # -# PAGER_ENV = LESS=-FRSX LV=-c +# PAGER_ENV = LESS=-FRX LV=-c # -# to say "export LESS=-FRSX (and LV=-c) if the environment variable +# to say "export LESS=-FRX (and LV=-c) if the environment variable # LESS (and LV) is not set, respectively". GIT-VERSION-FILE: FORCE @@ -1518,7 +1518,7 @@ NO_PYTHON = NoThanks endif ifndef PAGER_ENV -PAGER_ENV = LESS=-FRSX LV=-c +PAGER_ENV = LESS=-FRX LV=-c endif QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm index 34f2869..6641053 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)"; }
-- 1.9.2.698.ge58c0c2.dirty