From: Jeff King <peff@peff.net>
Date: Thu, 24 May 2012 23:32:37 +0000 (-0400)
Subject: ident: reject bogus email addresses with IDENT_STRICT
X-Git-Tag: v1.7.11-rc1~15^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8c5b1ae1b26a7512eb29e75391b8b24c0d0439e7;p=git.git

ident: reject bogus email addresses with IDENT_STRICT

If we come up with a hostname like "foo.(none)" because the
user's machine is not fully qualified, we should reject this
in strict mode (e.g., when we are making a commit object),
just as we reject an empty gecos username.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/ident.c b/ident.c
index c42258f4e..98852c7cc 100644
--- a/ident.c
+++ b/ident.c
@@ -288,6 +288,12 @@ const char *fmt_ident(const char *name, const char *email,
 		name = pw->pw_name;
 	}
 
+	if (strict && email == git_default_email.buf &&
+	    strstr(email, "(none)")) {
+		fputs(env_hint, stderr);
+		die("unable to auto-detect email address (got '%s')", email);
+	}
+
 	if (want_date) {
 		if (date_str && date_str[0]) {
 			if (parse_date(date_str, date, sizeof(date)) < 0)