Commit 872da32d authored by Christian Couder's avatar Christian Couder Committed by Junio C Hamano

Add "const" qualifier to "char *pager_program".

Also use "git_config_string" to simplify "config.c" code
where "pager_program" is set.
Signed-off-by: Christian Couder's avatarChristian Couder <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent ea5105a5
......@@ -610,7 +610,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;
......@@ -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)
......@@ -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;
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment