Add message_id and ref_message_id fields to struct rev_info, used in show_log with CMIT_FMT_EMAIL to set Message-Id and In-Reply-To/References respectively. Use these in git-format-patch to make the second and subsequent patch mails replies to the first patch mail.
Signed-off-by: Josh Triplett <josh@freedesktop.org> --- git-send-email already does this, but this change helps people who use things like git-imap-send or similar to send the patch emails by other means.
builtin-log.c | 23 +++++++++++++++++++++++ log-tree.c | 5 +++++ revision.h | 2 ++ 3 files changed, 30 insertions(+), 0 deletions(-)
Show changes to 3 files +30 −0
builtin-log.c, log-tree.c, revision.h
diff --git a/builtin-log.c b/builtin-log.c index 864c6cd..9d0cae1 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -220,6 +220,17 @@ static void get_patch_ids(struct rev_inf o2->flags = flags2; } +static void gen_message_id(char *dest, unsigned int length, char *base) +{ + const char *committer = git_committer_info(1); + const char *email_start = strrchr(committer, '<'); + const char *email_end = strrchr(committer, '>'); + if(!email_start || !email_end || email_start > email_end - 1) + die("Could not extract email from committer identity."); + snprintf(dest, length, "%s.%u.git.%.*s", base, time(NULL), + email_end - email_start - 1, email_start + 1); +} + int cmd_format_patch(int argc, const char **argv, char **envp) { struct commit *commit; @@ -233,6 +244,8 @@ int cmd_format_patch(int argc, const cha int ignore_if_in_upstream = 0; struct diff_options patch_id_opts; char *add_signoff = NULL; + char message_id[1024]; + char ref_message_id[1024]; init_revisions(&rev); rev.commit_format = CMIT_FMT_EMAIL; @@ -359,6 +372,16 @@ int cmd_format_patch(int argc, const cha int shown; commit = list[nr]; rev.nr = total - nr + (start_number - 1); + /* Make the second and subsequent mails replies to the first */ + if (nr == (total - 2)) { + strncpy(ref_message_id, message_id, + sizeof(ref_message_id)); + ref_message_id[sizeof(ref_message_id)-1] = '\0'; + rev.ref_message_id = ref_message_id; + } + gen_message_id(message_id, sizeof(message_id), + sha1_to_hex(commit->object.sha1)); + rev.message_id = message_id; if (!use_stdout) reopen_stdout(commit, rev.nr, keep_subject); shown = log_tree_commit(&rev, commit); diff --git a/log-tree.c b/log-tree.c index 9d8d46f..4971988 100644 --- a/log-tree.c +++ b/log-tree.c @@ -97,6 +97,11 @@ void show_log(struct rev_info *opt, cons subject = "Subject: "; printf("From %s Mon Sep 17 00:00:00 2001\n", sha1); + if (opt->message_id) + printf("Message-Id: <%s>\n", opt->message_id); + if (opt->ref_message_id) + printf("In-Reply-To: <%s>\nReferences: <%s>\n", + opt->ref_message_id, opt->ref_message_id); if (opt->mime_boundary) { static char subject_buffer[1024]; static char buffer[1024]; diff --git a/revision.h b/revision.h index c010a08..e23ec8f 100644 --- a/revision.h +++ b/revision.h @@ -61,6 +61,8 @@ struct rev_info { struct log_info *loginfo; int nr, total; const char *mime_boundary; + const char *message_id; + const char *ref_message_id; const char *add_signoff; const char *extra_headers;
-- 1.4.1.gbe4c7-dirty
