Christian CouderAlso use "git_config_string" to simplify "config.c" code where "pager_program" is set.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- cache.h | 2 +- config.c | 8 ++------ environment.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-)
Show changes to 3 files +4 −8
cache.h, config.c, environment.c
diff --git a/cache.h b/cache.h index cef058d..892f374 100644 --- a/cache.h +++ b/cache.h @@ -651,7 +651,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 const char *pager_program; extern int pager_in_use(void); extern int pager_use_color; diff --git a/config.c b/config.c index ca6af2d..01e3843 100644 --- a/config.c +++ b/config.c @@ -440,12 +440,8 @@ int git_default_config(const char *var, const char *value) return 0; } - if (!strcmp(var, "core.pager")) { - if (!value) - return config_error_nonbool(var); - pager_program = xstrdup(value); - return 0; - } + if (!strcmp(var, "core.pager")) + return git_config_string(&pager_program, var, value); if (!strcmp(var, "core.editor")) { if (!value) diff --git a/environment.c b/environment.c index 18a1c4e..b8869e9 100644 --- a/environment.c +++ b/environment.c @@ -30,7 +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; +const char *pager_program; int pager_use_color = 1; char *editor_program; char *excludes_file;
-- 1.5.4.1.129.gf12af-dirty