3 files changed, 4 insertions, 8 deletions
diff --git a/cache.h b/cache.h
index c83b123fa5..1ecaef14c3 100644
--- a/cache.h
+++ b/cache.h
@@ -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;
 
diff --git a/config.c b/config.c
index 7b8615d87d..eb6d2ad78b 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 18a1c4eec4..b8869e972e 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;