Brian GernhardtThis adds a configuration variable that performs the same function as, but is overridden by, GIT_PAGER.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> ---
This takes the last bit of git specific configuration out of my .profile and puts it in .gitconfig where it belongs.
I didn't know what name to use. I settled on pager.program, but thought that core.pager might be better since there are no other options in the pager section.
Documentation/config.txt | 4 ++++ cache.h | 1 + config.c | 5 +++++ environment.c | 1 + pager.c | 2 ++ 5 files changed, 13 insertions(+), 0 deletions(-)
Show changes to 5 files +13 −0
Documentation/config.txt, cache.h, config.c, environment.c, pager.c
diff --git a/Documentation/config.txt b/Documentation/config.txt index 1d96adf..1c4f3d5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -596,6 +596,10 @@ pack.deltaCacheLimit:: The maxium size of a delta, that is cached in gitlink:git-pack-objects[1]. Defaults to 1000. +pager.program:: + The command that git will use to page output. Can be overridden with + the `GIT_PAGER` environment variable. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/cache.h b/cache.h index 0d23a25..e64071e 100644 --- a/cache.h +++ b/cache.h @@ -546,6 +546,7 @@ extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char /* pager.c */ extern void setup_pager(void); +extern char *pager_program; extern int pager_in_use; extern int pager_use_color; diff --git a/config.c b/config.c index 4de8926..146b4bd 100644 --- a/config.c +++ b/config.c @@ -387,6 +387,11 @@ int git_default_config(const char *var, const char *value) return 0; } + if (!strcmp(var, "pager.program")) { + pager_program = xstrdup(value); + return 0; + } + /* Add other config variables here and to Documentation/config.txt. */ return 0; } diff --git a/environment.c b/environment.c index 1c2773f..f83fb9e 100644 --- a/environment.c +++ b/environment.c @@ -30,6 +30,7 @@ int core_compression_seen; size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE; size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT; size_t delta_base_cache_limit = 16 * 1024 * 1024; +char *pager_program; int pager_in_use; int pager_use_color = 1; int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */ diff --git a/pager.c b/pager.c index 5f280ab..3bfed02 100644 --- a/pager.c +++ b/pager.c @@ -32,6 +32,8 @@ void setup_pager(void) if (!isatty(1)) return; if (!pager) + pager = pager_program; + if (!pager) pager = getenv("PAGER"); if (!pager) pager = "less";
-- 1.5.3.rc0
