Re: [RFC] Clean way to disable pager
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:43:29
Junio C Hamano [off-list ref] writes:
Please resend an applyable patch with a sign-off (and acked-by as you have seen).
From 2c79b9a1b446ca9fa9d72fc595120da34fd403dd Mon Sep 17 00:00:00 2001
From: Matthieu Moy <redacted> Date: Sun, 19 Aug 2007 19:24:36 +0200 Subject: [PATCH] Add and document a global --no-pager option for git. To keep the change small, this is done by setting GIT_PAGER to "cat". Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Acked-by: Brian Gernhardt <redacted> Signed-off-by: Matthieu Moy <redacted> --- Documentation/git.txt | 6 +++++- git.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8017997..707a756 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt@@ -9,7 +9,8 @@ git - the stupid content tracker SYNOPSIS -------- [verse] -'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] +'git' [--version] [--exec-path[=GIT_EXEC_PATH]] + [-p|--paginate] [--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]
@@ -103,6 +104,9 @@ OPTIONS -p|--paginate:: Pipe all output into 'less' (or if set, $PAGER). +--no-pager:: + Do not pipe git output into a pager. + --git-dir=<path>:: Set the path to the repository. This can also be controlled by setting the GIT_DIR environment variable.
diff --git a/git.c b/git.c
index cab0e72..f280e7d 100644
--- a/git.c
+++ b/git.c@@ -4,7 +4,7 @@ #include "quote.h" const char git_usage_string[] = - "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]"; + "git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] [--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND
[ARGS]";
static void prepend_to_path(const char *dir, int len)
{@@ -58,6 +58,10 @@ static int handle_options(const char*** argv, int* argc, int* envchanged) } } else if (!strcmp(cmd, "-p") || !strcmp(cmd, "--paginate")) { setup_pager(); + } else if (!strcmp(cmd, "--no-pager")) { + setenv("GIT_PAGER", "cat", 1); + if (envchanged) + *envchanged = 1; } else if (!strcmp(cmd, "--git-dir")) { if (*argc < 2) { fprintf(stderr, "No directory given for --git-dir.\n" );
--
1.5.3.rc0.64.gf4f4a-dirty
--
Matthieu