Merge branch 'nd/i18n-branch-lego'

diff --git a/config.c b/config.c
index ac69cb62935cfe86fec4b557ad6546366e6b7d70..71ef171cab78bfdb9d6421f2a2b84acbce0bfc00 100644 (file)
--- a/config.c
+++ b/config.c
@@ -762,28 +762,6 @@ static int git_default_core_config(const char *var, const char *value)
        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;
-               return 0;
-       }
-
-       /* Add other config variables here and to Documentation/config.txt. */
-       return 0;
-}
-
 static int git_default_i18n_config(const char *var, const char *value)
 {
        if (!strcmp(var, "i18n.commitencoding"))
@@ -835,6 +813,8 @@ static int git_default_push_config(const char *var, const char *value)
                        push_default = PUSH_DEFAULT_NOTHING;
                else if (!strcmp(value, "matching"))
                        push_default = PUSH_DEFAULT_MATCHING;
+               else if (!strcmp(value, "simple"))
+                       push_default = PUSH_DEFAULT_SIMPLE;
                else if (!strcmp(value, "upstream"))
                        push_default = PUSH_DEFAULT_UPSTREAM;
                else if (!strcmp(value, "tracking")) /* deprecated */
@@ -843,8 +823,8 @@ static int git_default_push_config(const char *var, const char *value)
                        push_default = PUSH_DEFAULT_CURRENT;
                else {
                        error("Malformed value for %s: %s", var, value);
-                       return error("Must be one of nothing, matching, "
-                                    "tracking or current.");
+                       return error("Must be one of nothing, matching, simple, "
+                                    "upstream or current.");
                }
                return 0;
        }
@@ -868,7 +848,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);