From: Linus Torvalds Date: Wed, 18 Jun 2008 21:40:35 +0000 (-0700) Subject: Split up default "user" config parsing into helper routine X-Git-Tag: v1.6.0-rc0~209^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1364529d06e5fa3bc054396299944a7a4861776;p=git.git Split up default "user" config parsing into helper routine This follows the example of the "core" config, and splits out the default "user" config option parsing into a helper routine. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- diff --git a/config.c b/config.c index c3597e043..ee7642bf6 100644 --- a/config.c +++ b/config.c @@ -464,11 +464,8 @@ static int git_default_core_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_user_config(const char *var, const char *value) { - if (!prefixcmp(var, "core.")) - return git_default_core_config(var, value); - if (!strcmp(var, "user.name")) { if (!value) return config_error_nonbool(var); @@ -487,6 +484,18 @@ int git_default_config(const char *var, const char *value, void *dummy) return 0; } + /* Add other config variables here and to Documentation/config.txt. */ + 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 (!strcmp(var, "i18n.commitencoding")) return git_config_string(&git_commit_encoding, var, value);