kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Prefer EMAIL to username@hostname. 

The environment variable $EMAIL gives a better default of user's
preferred e-mail address than the hardcoded "username@hostname",
as it is understood by many existing programs.

We still honor GIT_*_EMAIL environment variables and user.email
configuration variable give them higher precedence, so that the
user can override $EMAIL or "username@hostname", as they are
likely to be more specific to the context of working on a
particular project.

Signed-off-by: Matt Kraai <kraai@ftbfs.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Matt Kraai 2007-07-05 17:29:41 -07:00 committed by Junio C Hamano
parent 20ccef4968
commit 46f74f007b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ident.c
View File

@ -83,11 +83,18 @@ static void setup_ident(void)
} }


if (!git_default_email[0]) { if (!git_default_email[0]) {
if (!pw) const char *email = getenv("EMAIL");
pw = getpwuid(getuid());
if (!pw) if (email && email[0])
die("You don't exist. Go away!"); strlcpy(git_default_email, email,
copy_email(pw); sizeof(git_default_email));
else {
if (!pw)
pw = getpwuid(getuid());
if (!pw)
die("You don't exist. Go away!");
copy_email(pw);
}
} }


/* And set the default date */ /* And set the default date */
@ -197,8 +204,6 @@ const char *fmt_ident(const char *name, const char *email,
name = git_default_name; name = git_default_name;
if (!email) if (!email)
email = git_default_email; email = git_default_email;
if (!email)
email = getenv("EMAIL");


if (!*name) { if (!*name) {
struct passwd *pw; struct passwd *pw;