We try to generate a sane message id for cover letters and
threading by appending some changing bits to the front of
the user's email address. The current code parses the email
out of the results of git_committer_info, but we can do this
much more easily by just calling ident_default_email
ourselves.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
Technically this is a regression if you really wanted:
GIT_COMMITTER_EMAIL=some.addr@xxxxxxxxxxx \
git format-patch --thread=deep
to make your environment variable part of the message-ids. I don't think
it matters, but I can adjust it if we care.
builtin/log.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index 690caa7..656bddf 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -737,15 +737,9 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha
static void gen_message_id(struct rev_info *info, char *base)
{
- const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
- const char *email_start = strrchr(committer, '<');
- const char *email_end = strrchr(committer, '>');
struct strbuf buf = STRBUF_INIT;
- if (!email_start || !email_end || email_start > email_end - 1)
- die(_("Could not extract email from committer identity."));
- strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
- (unsigned long) time(NULL),
- (int)(email_end - email_start - 1), email_start + 1);
+ strbuf_addf(&buf, "%s.%lu.git.%s", base,
+ (unsigned long) time(NULL), ident_default_email());
info->message_id = strbuf_detach(&buf, NULL);
}
--
1.7.10.1.16.g53a707b
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html