[PATCH 4/7] format-patch: use GIT_COMMITTER_EMAIL in message ids
- From
Jeff King <peff@peff.net>
- Date
- May 24, 2012, 23:28 UTC
- Message-ID
- <20120524232825.GD11084@sigill.intra.peff.net>
- 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