From: Junio C Hamano Date: Fri, 08 Jan 2010 16:08:50 GMT Subject: [RFC PATCH 3/3] ident.c: treat $EMAIL as giving user.email identity explicitly Message-ID: <7v637cefzh.fsf_-_@alter.siamese.dyndns.org> In-Reply-To: <7vskagh9fg.fsf@alter.siamese.dyndns.org> The environment variable EMAIL has been honored since 28a94f8 (Fall back to $EMAIL for missing GIT_AUTHOR_EMAIL and GIT_COMMITTER_EMAIL, 2007-04-28) as the end-user's wish to use the address as the identity. When we use it, we should say we are explicitly given email by the user. Signed-off-by: Junio C Hamano --- * This is an RFC as some people would feel strongly about _not_ using $EMAIL as their commit identity and would rather override it explicitly with user.email; if they weren't told about git using their $EMAIL, they will complain. ident.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ident.c b/ident.c index e67c5ad..d4f6145 100644 --- a/ident.c +++ b/ident.c @@ -85,10 +85,11 @@ static void setup_ident(void) if (!git_default_email[0]) { const char *email = getenv("EMAIL"); - if (email && email[0]) + if (email && email[0]) { strlcpy(git_default_email, email, sizeof(git_default_email)); - else { + user_ident_explicitly_given |= IDENT_MAIL_GIVEN; + } else { if (!pw) pw = getpwuid(getuid()); if (!pw) -- 1.6.6.209.g52296.dirty