Skip to content

Commit

Permalink
pager: do allow spawning pager recursively
Browse files Browse the repository at this point in the history
This reverts commit 88e8f90, which
tried to allow

    GIT_PAGER="git -p column --mode='dense color'" git -p branch

and still wanted to avoid "git -p column" to invoke itself.  However,
this falls into "don't do that -p then" category.

In particular, inside "git log", with results going through less, a
potentially interesting commit may be found and from there inside
"less", the user may want to execute "git show <commit>".  Before
the commit being reverted, this used to show the patch in less but
it no longer does.

Signed-off-by: Jörn Engel <joern@logfs.org>
Reviewed-by: Jeff King <peff@peff.net>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Acked-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jörn Engel authored and Junio C Hamano committed Apr 28, 2014
1 parent 0bc85ab commit c0459ca
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pager.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void setup_pager(void)
{
const char *pager = git_pager(isatty(1));

if (!pager || pager_in_use())
if (!pager)
return;

/*
Expand Down

0 comments on commit c0459ca

Please sign in to comment.