Add option to set initial In-Reply-To/References

Add the --in-reply-to option to provide a Message-Id for an initial
In-Reply-To/References header, useful for including a new patch series as part
of an existing thread.

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:49:08 -07:00 committed by Junio C Hamano
parent cc35de8470
commit da56645dd7
2 changed files with 16 additions and 0 deletions

View File

@ -11,6 +11,7 @@ SYNOPSIS
[verse]
'git-format-patch' [-n | -k] [-o <dir> | --stdout] [--attach] [--thread]
[-s | --signoff] [--diff-options] [--start-number <n>]
[--in-reply-to=Message-Id]
<since>[..<until>]
DESCRIPTION
@ -72,6 +73,11 @@ OPTIONS
subsequent mails appear as replies to the first. Also generates
the Message-Id header to reference.
--in-reply-to=Message-Id::
Make the first mail (or all the mails with --no-thread) appear as a
reply to the given Message-Id, which avoids breaking threads to
provide a new patch series.
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each

View File

@ -249,6 +249,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
int keep_subject = 0;
int ignore_if_in_upstream = 0;
int thread = 0;
char *in_reply_to = NULL;
struct diff_options patch_id_opts;
char *add_signoff = NULL;
char message_id[1024];
@ -320,6 +321,14 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
ignore_if_in_upstream = 1;
else if (!strcmp(argv[i], "--thread"))
thread = 1;
else if (!strncmp(argv[i], "--in-reply-to=", 14))
in_reply_to = argv[i] + 14;
else if (!strcmp(argv[i], "--in-reply-to")) {
i++;
if (i == argc)
die("Need a Message-Id for --in-reply-to");
in_reply_to = argv[i];
}
else
argv[j++] = argv[i];
}
@ -377,6 +386,7 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
if (numbered)
rev.total = total + start_number - 1;
rev.add_signoff = add_signoff;
rev.ref_message_id = in_reply_to;
while (0 <= --nr) {
int shown;
commit = list[nr];