diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:48:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-11 13:48:07 -0700 |
| commit | 5a5bd23486c5d8721f4654eadec75213d3dc074f (patch) | |
| tree | 51a0d4bf4b3277c010fe623f55e32c5824994eef /log-tree.c | |
| parent | 72e3c32bef0574ec6febc5e815b0467f892ef7e2 (diff) | |
| parent | 30984ed2e92651962c6b8bdacf1f84da75d1da95 (diff) | |
| download | git-5a5bd23486c5d8721f4654eadec75213d3dc074f.tar.gz git-5a5bd23486c5d8721f4654eadec75213d3dc074f.tar.xz | |
Merge branch 'tr/format-patch-thread'
* tr/format-patch-thread:
format-patch: support deep threading
format-patch: thread as reply to cover letter even with in-reply-to
format-patch: track several references
format-patch: threading test reactivation
Conflicts:
builtin-log.c
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c index 63cff7435..9565c184d 100644 --- a/log-tree.c +++ b/log-tree.c @@ -6,6 +6,7 @@ #include "log-tree.h" #include "reflog-walk.h" #include "refs.h" +#include "string-list.h" struct decoration name_decoration = { "object names" }; @@ -211,9 +212,13 @@ void log_write_email_headers(struct rev_info *opt, const char *name, printf("Message-Id: <%s>\n", opt->message_id); graph_show_oneline(opt->graph); } - if (opt->ref_message_id) { - printf("In-Reply-To: <%s>\nReferences: <%s>\n", - opt->ref_message_id, opt->ref_message_id); + if (opt->ref_message_ids && opt->ref_message_ids->nr > 0) { + int i, n; + n = opt->ref_message_ids->nr; + printf("In-Reply-To: <%s>\n", opt->ref_message_ids->items[n-1].string); + for (i = 0; i < n; i++) + printf("%s<%s>\n", (i > 0 ? "\t" : "References: "), + opt->ref_message_ids->items[i].string); graph_show_oneline(opt->graph); } if (opt->mime_boundary) { |