git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael Haggerty <haggerty@jpk.com>,
	git discussion list <git@vger.kernel.org>
Subject: [PATCH 6/7] ident: reject bogus email addresses with IDENT_STRICT
Date: Thu, 24 May 2012 19:32:37 -0400	[thread overview]
Message-ID: <20120524233237.GF11084@sigill.intra.peff.net> (raw)
In-Reply-To: <20120524232515.GA11054@sigill.intra.peff.net>

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>
---
Note that in conjunction with the previous patch, you can no longer "git
commit" with such a bogus address. I think this is a good thing.

However, it's possible some old-timers might disagree. I remember Linus
a long time ago mentioning that using the machine-name in the committer
line was a _feature_. These days he seems to set user.email to a real
address, though (and I think that is sane these days, because other
tools really want to do use identities as more than just a token. E.g.,
email tools, gpg-signing, etc).

 ident.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ident.c b/ident.c
index c42258f..ca098d9 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)
-- 
1.7.10.1.25.g7031a0f

  parent reply	other threads:[~2012-05-24 23:32 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-24 12:01 t4014 broken by 43ae9f47ab: format-patch: use default email for generating message ids Michael Haggerty
2012-05-24 17:16 ` Jeff King
2012-05-24 20:07   ` Junio C Hamano
2012-05-24 20:15     ` Jeff King
2012-05-24 23:25       ` Jeff King
2012-05-24 23:26         ` [PATCH 1/7] ident: refactor empty ident error message Jeff King
2012-05-24 23:26         ` [PATCH 2/7] ident: refactor NO_DATE flag in fmt_ident Jeff King
2012-05-24 23:27         ` [PATCH 3/7] ident: let callers omit name with fmt_indent Jeff King
2012-05-24 23:28         ` [PATCH 4/7] format-patch: use GIT_COMMITTER_EMAIL in message ids Jeff King
2012-05-24 23:28         ` [PATCH 5/7] ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT Jeff King
2012-05-24 23:32         ` Jeff King [this message]
2012-05-24 23:32         ` [PATCH 7/7] format-patch: do not use bogus email addresses in message ids Jeff King
2012-05-25  0:08         ` t4014 broken by 43ae9f47ab: format-patch: use default email for generating " Junio C Hamano
2012-05-25  0:34           ` Jeff King
2012-05-24 20:49   ` Michael Haggerty
2012-05-24 21:02     ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120524233237.GF11084@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=haggerty@jpk.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).