Merge branch 'jc/ident'

[git.git] / config.c

diff --git a/config.c b/config.c
index f4f2c59a34cd9fc70db940871caaf00b94a6ef2e..6963fbea43e6420f5f8dafc5b94fb5c27de6ffd2 100644 (file)
--- a/config.c
+++ b/config.c
@@ -533,8 +533,7 @@ static int git_default_user_config(const char *var, const char *value)
                if (!value)
                        return config_error_nonbool(var);
                strlcpy(git_default_name, value, sizeof(git_default_name));
-               if (git_default_email[0])
-                       user_ident_explicitly_given = 1;
+               user_ident_explicitly_given |= IDENT_NAME_GIVEN;
                return 0;
        }
 
@@ -542,8 +541,7 @@ static int git_default_user_config(const char *var, const char *value)
                if (!value)
                        return config_error_nonbool(var);
                strlcpy(git_default_email, value, sizeof(git_default_email));
-               if (git_default_name[0])
-                       user_ident_explicitly_given = 1;
+               user_ident_explicitly_given |= IDENT_MAIL_GIVEN;
                return 0;
        }