summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-04-13 10:54:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-27 16:26:38 (GMT)
commit88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84 (patch)
tree5252b4bd4cb65fda5aa3bd56c3b86f0b22645e5d
parent7e29b8254f08af820b2f0c3770836638ffe517ab (diff)
downloadgit-88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84.zip
git-88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84.tar.gz
git-88e8f908f2b0c56f9ccf8134d8ff9f689af9cc84.tar.bz2
Stop starting pager recursively
git-column can be used as a pager for other git commands, something like this: GIT_PAGER="git -p column --mode='dense color'" git -p branch The problem with this is that "git -p column" also has $GIT_PAGER set so the pager runs itself again as another pager. The end result is an infinite loop of forking. Other git commands have the same problem if being abused this way. Check if $GIT_PAGER is already set and stop launching another pager. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--pager.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pager.c b/pager.c
index 05584de..4dcb08d 100644
--- a/pager.c
+++ b/pager.c
@@ -73,7 +73,7 @@ void setup_pager(void)
{
const char *pager = git_pager(isatty(1));
- if (!pager)
+ if (!pager || pager_in_use())
return;
/*