summaryrefslogtreecommitdiff
path: root/pager.c
diff options
context:
space:
mode:
authorJörn Engel <joern@logfs.org>2014-04-21 20:46:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-28 23:03:22 (GMT)
commitc0459ca4dc47edf5d63850a34a5f67febd966f3d (patch)
treea068073ba6d7936b9b11c5dcf0c7acc8cf6e4772 /pager.c
parent0bc85abb7aa9b24b093253018801a0fb43d01122 (diff)
downloadgit-c0459ca4dc47edf5d63850a34a5f67febd966f3d.zip
git-c0459ca4dc47edf5d63850a34a5f67febd966f3d.tar.gz
git-c0459ca4dc47edf5d63850a34a5f67febd966f3d.tar.bz2
pager: do allow spawning pager recursively
This reverts commit 88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84, 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>
Diffstat (limited to 'pager.c')
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index 0cc75a8..53670a6 100644
--- a/pager.c
+++ b/pager.c
@@ -64,7 +64,7 @@ void setup_pager(void)
{
const char *pager = git_pager(isatty(1));
- if (!pager || pager_in_use())
+ if (!pager)
return;
/*