summaryrefslogtreecommitdiff
path: root/pager.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2009-10-30 20:41:27 -0500
committerJunio C Hamano <gitster@pobox.com>2009-11-13 12:20:47 -0800
commit6361824589bc2d32989a9a33f985d09a368436a3 (patch)
tree31050baa04194fee66e0c05b0e9569c538b41925 /pager.c
parent44fcb4977cbae67f4698306ccfe982420ceebcbf (diff)
downloadgit-6361824589bc2d32989a9a33f985d09a368436a3.tar.gz
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>
Diffstat (limited to 'pager.c')
-rw-r--r--pager.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/pager.c b/pager.c
index 86facec7b4..0b63d99fe7 100644
--- a/pager.c
+++ b/pager.c
@@ -44,12 +44,14 @@ static void wait_for_pager_signal(int signo)
raise(signo);
}
-void setup_pager(void)
+const char *git_pager(void)
{
- const char *pager = getenv("GIT_PAGER");
+ const char *pager;
if (!isatty(1))
- return;
+ return NULL;
+
+ pager = getenv("GIT_PAGER");
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"))
+ 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 */