undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-format-patch: Make the second and subsequent mails replies to the first

Browse Source 
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>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Josh Triplett 2006-07-14 17:48:51 -07:00 committed by Junio C Hamano
parent a3e65d74ee
commit d1566f7883
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builtin-log.c
View File

@ -226,6 +226,17 @@ static void get_patch_ids(struct rev_info *rev, struct diff_options *options)
o2->flags = flags2; 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) int cmd_format_patch(int argc, const char **argv, char **envp)
{ {
struct commit *commit; struct commit *commit;
@ -239,6 +250,8 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
int ignore_if_in_upstream = 0; int ignore_if_in_upstream = 0;
struct diff_options patch_id_opts; struct diff_options patch_id_opts;
char *add_signoff = NULL; char *add_signoff = NULL;
char message_id[1024];
char ref_message_id[1024];
git_config(git_format_config); git_config(git_format_config);
init_revisions(&rev); init_revisions(&rev);
@ -365,6 +378,16 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
int shown; int shown;
commit = list[nr]; commit = list[nr];
rev.nr = total - nr + (start_number - 1); 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) if (!use_stdout)
reopen_stdout(commit, rev.nr, keep_subject); reopen_stdout(commit, rev.nr, keep_subject);
shown = log_tree_commit(&rev, commit); shown = log_tree_commit(&rev, commit);

5
log-tree.c
View File

@ -97,6 +97,11 @@ void show_log(struct rev_info *opt, const char *sep)
subject = "Subject: "; subject = "Subject: ";
printf("From %s Mon Sep 17 00:00:00 2001\n", sha1); 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) { if (opt->mime_boundary) {
static char subject_buffer[1024]; static char subject_buffer[1024];
static char buffer[1024]; static char buffer[1024];

2
revision.h
View File

@ -61,6 +61,8 @@ struct rev_info {
struct log_info *loginfo; struct log_info *loginfo;
int nr, total; int nr, total;
const char *mime_boundary; const char *mime_boundary;
const char *message_id;
const char *ref_message_id;
const char *add_signoff; const char *add_signoff;
const char *extra_headers; const char *extra_headers;