git on Mac OS and precomposed unicode

diff --git a/config.c b/config.c
index eeee986022fc8f235c43a2d45eb942fc0095f8b1..eaef3b644375545f9c8e49c460132141269394a9 100644 (file)
--- a/config.c
+++ b/config.c
@@ -758,25 +758,8 @@ static int git_default_core_config(const char *var, const char *value)
                return 0;
        }
 
-       /* Add other config variables here and to Documentation/config.txt. */
-       return 0;
-}
-
-static int git_default_user_config(const char *var, const char *value)
-{
-       if (!strcmp(var, "user.name")) {
-               if (!value)
-                       return config_error_nonbool(var);
-               strlcpy(git_default_name, value, sizeof(git_default_name));
-               user_ident_explicitly_given |= IDENT_NAME_GIVEN;
-               return 0;
-       }
-
-       if (!strcmp(var, "user.email")) {
-               if (!value)
-                       return config_error_nonbool(var);
-               strlcpy(git_default_email, value, sizeof(git_default_email));
-               user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
+       if (!strcmp(var, "core.precomposeunicode")) {
+               precomposed_unicode = git_config_bool(var, value);
                return 0;
        }
 
@@ -870,7 +853,7 @@ int git_default_config(const char *var, const char *value, void *dummy)
                return git_default_core_config(var, value);
 
        if (!prefixcmp(var, "user."))
-               return git_default_user_config(var, value);
+               return git_ident_config(var, value, dummy);
 
        if (!prefixcmp(var, "i18n."))
                return git_default_i18n_config(var, value);