[PATCH v9 2/9] Stop starting pager recursively
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 13, 2012, 10:54 UTC
- Message-ID
- <1334314481-14470-3-git-send-email-pclouds@gmail.com>
- In-Reply-To
- <1334314481-14470-1-git-send-email-pclouds@gmail.com>
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> --- pager.c | 2 +- 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; /*
-- 1.7.3.1.256.g2539c.dirty