Teach git var about GIT_PAGER

Expose the command found by setup_pager() for scripts to use.
Scripts can use this to avoid repeating the logic to look for a
proper pager in each command.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt
index 89e4b4fa0c7c8378cbce46ba8ef460777b3114e7..ef6aa81872eb9e67eaf8183cfd5359d97e6c772b 100644 (file)
--- a/Documentation/git-var.txt
+++ b/Documentation/git-var.txt
@@ -44,6 +44,12 @@ GIT_EDITOR::
     environment variable, then `core.editor` configuration, then
     `$VISUAL`, then `$EDITOR`, and then finally 'vi'.
 
     environment variable, then `core.editor` configuration, then
     `$VISUAL`, then `$EDITOR`, and then finally 'vi'.
 

+GIT_PAGER::
+    Text viewer for use by git commands (e.g., 'less').  The value
+    is meant to be interpreted by the shell.  The order of preference
+    is the `$GIT_PAGER` environment variable, then `core.pager`
+    configuration, then `$PAGER`, and then finally 'less'.
+

 Diagnostics
 -----------
 You don't exist. Go away!::
 Diagnostics
 -----------
 You don't exist. Go away!::

diff --git a/cache.h b/cache.h
index 311cfe121945634fd903a0ee9178548c5408c7e1..5aaa4bac98e1ccba7426b2003f2488b7e41b346b 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -751,6 +751,7 @@ extern const char *git_committer_info(int);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);
 extern const char *git_editor(void);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);
 extern const char *git_editor(void);

+extern const char *git_pager(void);

 
 struct checkout {
        const char *base_dir;
 
 struct checkout {
        const char *base_dir;

diff --git a/pager.c b/pager.c
index 86facec7b417b26a7dbd9b3c1338149fcecd5588..0b63d99fe770153bdfcc99d23ef45befc14d45b0 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -44,12 +44,14 @@ static void wait_for_pager_signal(int signo)
        raise(signo);
 }
 
        raise(signo);
 }
 

-void setup_pager(void)
+const char *git_pager(void)

 {
 {

-       const char *pager = getenv("GIT_PAGER");
+       const char *pager;

 
        if (!isatty(1))
 
        if (!isatty(1))

-               return;
+               return NULL;
+
+       pager = getenv("GIT_PAGER");

        if (!pager) {
                if (!pager_program)
                        git_config(git_default_config, NULL);
        if (!pager) {
                if (!pager_program)
                        git_config(git_default_config, NULL);


@@ -60,6 +62,16 @@ void setup_pager(void)
        if (!pager)
                pager = "less";
        else if (!*pager || !strcmp(pager, "cat"))
        if (!pager)
                pager = "less";
        else if (!*pager || !strcmp(pager, "cat"))

+               pager = NULL;
+
+       return pager;
+}
+
+void setup_pager(void)
+{
+       const char *pager = git_pager();
+
+       if (!pager)

                return;
 
        spawned_pager = 1; /* means we are emitting to terminal */
                return;
 
        spawned_pager = 1; /* means we are emitting to terminal */

diff --git a/var.c b/var.c
index b502487e536d76d10370182427fb0f4ab8af8a7b..d9892f85ce954883427ac4f61d9de9d591c0827c 100644 (file)
--- a/var.c
+++ b/var.c
@@ -18,6 +18,15 @@ static const char *editor(int flag)
        return pgm;
 }
 
        return pgm;
 }
 

+static const char *pager(int flag)
+{
+       const char *pgm = git_pager();
+
+       if (!pgm)
+               pgm = "cat";
+       return pgm;
+}
+

 struct git_var {
        const char *name;
        const char *(*read)(int);
 struct git_var {
        const char *name;
        const char *(*read)(int);


@@ -26,6 +35,7 @@ static struct git_var git_vars[] = {
        { "GIT_COMMITTER_IDENT", git_committer_info },
        { "GIT_AUTHOR_IDENT",   git_author_info },
        { "GIT_EDITOR", editor },
        { "GIT_COMMITTER_IDENT", git_committer_info },
        { "GIT_AUTHOR_IDENT",   git_author_info },
        { "GIT_EDITOR", editor },

+       { "GIT_PAGER", pager },

        { "", NULL },
 };
 
        { "", NULL },
 };