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

Also use "git_config_string" to simplify "config.c" code
where "excludes_file" is set.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index ce7b386a4df346b91fcd00df3250587ff85711b8..43ba6a3ba568fb0b9e93c8aeb78782e12bfda416 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -615,7 +615,7 @@ extern int pager_in_use(void);
 extern int pager_use_color;
 
 extern const char *editor_program;
-extern char *excludes_file;
+extern const char *excludes_file;
 
 /* base85 */
 int decode_85(char *dst, const char *line, int linelen);

diff --git a/config.c b/config.c
index 703c2085a5d7745c06633e534e445926dfdc3185..b82907cb857c9f745a2afa7abe786ee0c7ae1ff8 100644 (file)
--- a/config.c
+++ b/config.c
@@ -446,12 +446,8 @@ int git_default_config(const char *var, const char *value)
        if (!strcmp(var, "core.editor"))
                return git_config_string(&editor_program, var, value);
 
-       if (!strcmp(var, "core.excludesfile")) {
-               if (!value)
-                       return config_error_nonbool(var);
-               excludes_file = xstrdup(value);
-               return 0;
-       }
+       if (!strcmp(var, "core.excludesfile"))
+               return git_config_string(&excludes_file, var, value);
 
        if (!strcmp(var, "core.whitespace")) {
                if (!value)

diff --git a/environment.c b/environment.c
index 9556009324c5945d4212be9155076f7f8b8adfbe..fa3633372b8249899ff1e57a2f1431de029b211d 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -33,7 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024;
 const char *pager_program;
 int pager_use_color = 1;
 const char *editor_program;
-char *excludes_file;
+const char *excludes_file;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;