Split up default "i18n" and "branch" config parsing into helper routines
.. just to finish it off. We'll leave the pager color config alone, since it is such an odd-ball special case anyway. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
d1364529d0
commit
1141f4925c
40
config.c
40
config.c
@ -488,25 +488,20 @@ static int git_default_user_config(const char *var, const char *value)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int git_default_config(const char *var, const char *value, void *dummy)
|
||||
static int git_default_i18n_config(const char *var, const char *value)
|
||||
{
|
||||
if (!prefixcmp(var, "core."))
|
||||
return git_default_core_config(var, value);
|
||||
|
||||
if (!prefixcmp(var, "user."))
|
||||
return git_default_user_config(var, value);
|
||||
|
||||
if (!strcmp(var, "i18n.commitencoding"))
|
||||
return git_config_string(&git_commit_encoding, var, value);
|
||||
|
||||
if (!strcmp(var, "i18n.logoutputencoding"))
|
||||
return git_config_string(&git_log_output_encoding, var, value);
|
||||
|
||||
if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
|
||||
pager_use_color = git_config_bool(var,value);
|
||||
return 0;
|
||||
}
|
||||
/* Add other config variables here and to Documentation/config.txt. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int git_default_branch_config(const char *var, const char *value)
|
||||
{
|
||||
if (!strcmp(var, "branch.autosetupmerge")) {
|
||||
if (value && !strcasecmp(value, "always")) {
|
||||
git_branch_track = BRANCH_TRACK_ALWAYS;
|
||||
@ -535,6 +530,29 @@ int git_default_config(const char *var, const char *value, void *dummy)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int git_default_config(const char *var, const char *value, void *dummy)
|
||||
{
|
||||
if (!prefixcmp(var, "core."))
|
||||
return git_default_core_config(var, value);
|
||||
|
||||
if (!prefixcmp(var, "user."))
|
||||
return git_default_user_config(var, value);
|
||||
|
||||
if (!prefixcmp(var, "i18n."))
|
||||
return git_default_i18n_config(var, value);
|
||||
|
||||
if (!prefixcmp(var, "branch."))
|
||||
return git_default_branch_config(var, value);
|
||||
|
||||
if (!strcmp(var, "pager.color") || !strcmp(var, "color.pager")) {
|
||||
pager_use_color = git_config_bool(var,value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Add other config variables here and to Documentation/config.txt. */
|
||||
return 0;
|
||||
}
|
||||
|
||||
int git_config_from_file(config_fn_t fn, const char *filename, void *data)
|
||||
{
|
||||
int ret;
|
||||
|
Loading…
Reference in New Issue
Block a user