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 4/7] format-patch: use GIT_COMMITTER_EMAIL in message ids
Date: Thu, 24 May 2012 19:28:25 -0400 [thread overview]
Message-ID: <20120524232825.GD11084@sigill.intra.peff.net> (raw)
In-Reply-To: <20120524232515.GA11054@sigill.intra.peff.net>
Before commit 43ae9f4, we generated the tail of a message id
by calling git_committer_info and parsing the email out of
the result. 43ae9f4 changed to use ident_default_email
directly, so we didn't have to bother with parsing. As a
side effect, it meant we no longer used GIT_COMMITTER_EMAIL
at all.
In general, this is probably reasonable behavior. Either the
default email is sane on your system, or you are using
user.email to provide something sane. The exception is if
you rely on GIT_COMMITTER_EMAIL being set all the time to
override the bogus generated email.
This is unlikely to match anybody's real-life setup, but we
do use it in the test environment. And furthermore, it's
what we have always done, and the change in 43ae9f4 was
about cleaning up, not fixing any bug; we should be
conservative and keep the behavior identical.
Signed-off-by: Jeff King <peff@peff.net>
---
This one should fix Michael's test failure. Let me know if it doesn't.
Arguably the call to ident_default_email() in http-push.c should be
converted in the same way. I'm unclear on how that value is actually
used, so it may not matter at all.
builtin/log.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/log.c b/builtin/log.c
index 8010a40..4538309 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -740,7 +740,8 @@ static void gen_message_id(struct rev_info *info, char *base)
{
struct strbuf buf = STRBUF_INIT;
strbuf_addf(&buf, "%s.%lu.git.%s", base,
- (unsigned long) time(NULL), ident_default_email());
+ (unsigned long) time(NULL),
+ git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE));
info->message_id = strbuf_detach(&buf, NULL);
}
--
1.7.10.1.25.g7031a0f
next prev parent reply other threads:[~2012-05-24 23:28 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 ` Jeff King [this message]
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 ` [PATCH 6/7] ident: reject bogus email addresses with IDENT_STRICT Jeff King
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=20120524232825.GD11084@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).