{"thread":{"id":"8888","subject":"[PATCH] Prefer EMAIL to username@hostname.","startedAt":"2007-07-06T00:29:41Z","lastAt":"2007-07-06T00:29:41Z","messageCount":1,"participants":["Matt Kraai"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"46579","messageId":"11836817811266-git-send-email-kraai@ftbfs.org","threadId":"8888","inReplyTo":null,"subject":"[PATCH] Prefer EMAIL to username@hostname.","fromName":"Matt Kraai","fromEmail":"kraai@ftbfs.org","sentAt":"2007-07-06T00:29:41Z","receivedAt":"2007-07-06T00:29:41Z","isPatch":true,"sender":{"key":"kraai@ftbfs.org","avatar":null},"body":"Signed-off-by: Matt Kraai <kraai@ftbfs.org>\n---\n ident.c |   19 ++++++++++++-------\n 1 files changed, 12 insertions(+), 7 deletions(-)\n\ndiff --git a/ident.c b/ident.c\nindex 3d49608..6612d17 100644\n--- a/ident.c\n+++ b/ident.c\n@@ -83,11 +83,18 @@ static void setup_ident(void)\n \t}\n \n \tif (!git_default_email[0]) {\n-\t\tif (!pw)\n-\t\t\tpw = getpwuid(getuid());\n-\t\tif (!pw)\n-\t\t\tdie(\"You don't exist. Go away!\");\n-\t\tcopy_email(pw);\n+\t\tconst char *email = getenv(\"EMAIL\");\n+\n+\t\tif (email && email[0])\n+\t\t\tstrlcpy(git_default_email, email,\n+\t\t\t\tsizeof(git_default_email));\n+\t\telse {\n+\t\t\tif (!pw)\n+\t\t\t\tpw = getpwuid(getuid());\n+\t\t\tif (!pw)\n+\t\t\t\tdie(\"You don't exist. Go away!\");\n+\t\t\tcopy_email(pw);\n+\t\t}\n \t}\n \n \t/* And set the default date */\n@@ -197,8 +204,6 @@ const char *fmt_ident(const char *name, const char *email,\n \t\tname = git_default_name;\n \tif (!email)\n \t\temail = git_default_email;\n-\tif (!email)\n-\t\temail = getenv(\"EMAIL\");\n \n \tif (!*name) {\n \t\tstruct passwd *pw;\n-- \n1.5.2.3\n"}]}