From: Christian Couder <chriscool@tuxfamily.org>
Date: Sat, 16 Feb 2008 05:01:59 +0000 (+0100)
Subject: Add "const" qualifier to "char *excludes_file".
X-Git-Tag: v1.5.4.2~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dfb068be8deef2065970b2a7889acc51abf4dd78;p=git.git

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 ce7b386a4..43ba6a3ba 100644
--- 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 703c2085a..b82907cb8 100644
--- 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 955600932..fa3633372 100644
--- 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;