aboutsummaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2012-05-24 19:28:25 -0400
committerJunio C Hamano <gitster@pobox.com>2012-05-24 17:16:41 -0700
commitc73f384f92dcb0d7111533ed21f6c2dc9fcc323b (patch)
treec11f4a9020a6e0917d0803fb7db41f88be7890f1 /builtin/log.c
parentc15e1987aec562107bd8e4a9fdeebf6d27d0e53a (diff)
downloadgit-c73f384f92dcb0d7111533ed21f6c2dc9fcc323b.tar.gz
git-c73f384f92dcb0d7111533ed21f6c2dc9fcc323b.tar.xz
format-patch: use GIT_COMMITTER_EMAIL in message ids
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 8010a4045..4538309d0 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);
}