summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 22:39:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-20 22:39:52 (GMT)
commit15a873d6e85d8089117a6a2141c8158bd370cf49 (patch)
tree95e9cbb5c1b4efa101e6a4aeac14ddc90121f138 /config.c
parent07301eaa766efac7818eac7a4a6db0d0c3948d66 (diff)
parent8b770a2a24456089c0dd0230035a7d88aee7e26a (diff)
downloadgit-15a873d6e85d8089117a6a2141c8158bd370cf49.zip
git-15a873d6e85d8089117a6a2141c8158bd370cf49.tar.gz
git-15a873d6e85d8089117a6a2141c8158bd370cf49.tar.bz2
Merge branch 'jc/ident'
* jc/ident: ident.c: replace fprintf with fputs to suppress compiler warning user_ident_sufficiently_given(): refactor the logic to be usable from elsewhere ident.c: treat $EMAIL as giving user.email identity explicitly ident.c: check explicit identity for name and email separately ident.c: remove unused variables
Diffstat (limited to 'config.c')
-rw-r--r--config.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/config.c b/config.c
index f4f2c59..6963fbe 100644
--- 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;
}