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>
This commit is contained in:
parent
ee9601e6be
commit
dfb068be8d
2
cache.h
2
cache.h
@ -615,7 +615,7 @@ extern int pager_in_use(void);
|
|||||||
extern int pager_use_color;
|
extern int pager_use_color;
|
||||||
|
|
||||||
extern const char *editor_program;
|
extern const char *editor_program;
|
||||||
extern char *excludes_file;
|
extern const char *excludes_file;
|
||||||
|
|
||||||
/* base85 */
|
/* base85 */
|
||||||
int decode_85(char *dst, const char *line, int linelen);
|
int decode_85(char *dst, const char *line, int linelen);
|
||||||
|
8
config.c
8
config.c
@ -446,12 +446,8 @@ int git_default_config(const char *var, const char *value)
|
|||||||
if (!strcmp(var, "core.editor"))
|
if (!strcmp(var, "core.editor"))
|
||||||
return git_config_string(&editor_program, var, value);
|
return git_config_string(&editor_program, var, value);
|
||||||
|
|
||||||
if (!strcmp(var, "core.excludesfile")) {
|
if (!strcmp(var, "core.excludesfile"))
|
||||||
if (!value)
|
return git_config_string(&excludes_file, var, value);
|
||||||
return config_error_nonbool(var);
|
|
||||||
excludes_file = xstrdup(value);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!strcmp(var, "core.whitespace")) {
|
if (!strcmp(var, "core.whitespace")) {
|
||||||
if (!value)
|
if (!value)
|
||||||
|
@ -33,7 +33,7 @@ size_t delta_base_cache_limit = 16 * 1024 * 1024;
|
|||||||
const char *pager_program;
|
const char *pager_program;
|
||||||
int pager_use_color = 1;
|
int pager_use_color = 1;
|
||||||
const char *editor_program;
|
const char *editor_program;
|
||||||
char *excludes_file;
|
const char *excludes_file;
|
||||||
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
|
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
|
||||||
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
|
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user