diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-17 20:48:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-17 22:42:40 -0700 |
| commit | 212620fe7e74f6bd4a30a5a39d7c7b3f685ef888 (patch) | |
| tree | 86c779e0aca23b9a33da3f938c1232b9cd0f9dbf /log-tree.c | |
| parent | 5a664cf2c76ed83166f5f3ce7385e3cb058e8834 (diff) | |
| download | git-212620fe7e74f6bd4a30a5a39d7c7b3f685ef888.tar.gz | |
format-patch: append --signature after notes
When appending a new signature with "format-patch --signature", if
the "--notes" option is also in effect, the location of the new
signature (and if the signature should be added in the first place)
should be decided using the contents of the original commit log
message, before the message from the notes is added.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c index e7e08f42eb..4390b117e3 100644 --- a/log-tree.c +++ b/log-tree.c @@ -672,12 +672,14 @@ void show_log(struct rev_info *opt) ctx.reflog_info = opt->reflog_info; ctx.fmt = opt->commit_format; pretty_print_commit(&ctx, commit, &msgbuf); + + if (opt->add_signoff) + append_signoff(&msgbuf, opt->add_signoff); + if ((ctx.fmt != CMIT_FMT_USERFORMAT) && ctx.notes_message && *ctx.notes_message) strbuf_addstr(&msgbuf, ctx.notes_message); - if (opt->add_signoff) - append_signoff(&msgbuf, opt->add_signoff); if (opt->show_log_size) { printf("log size %i\n", (int)msgbuf.len); graph_show_oneline(opt->graph); |