diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-10-18 06:02:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-18 09:42:40 +0400 |
| commit | 5a664cf2c76ed83166f5f3ce7385e3cb058e8834 (patch) | |
| tree | d6586d0246e652c4c7909b8bbe7e196d99a40bc9 /log-tree.c | |
| parent | ddf333f66cb8b8647a40e5d39731eaf63ee9fd44 (diff) | |
pretty_print_commit(): do not append notes message
The only case pretty_print_commit() appends notes message to the log
message taken from the commit is when show_log() calls it with the
notes_message field set, and the output format is not the userformat
(i.e. when substituting "%N"). No other users of this function sets
this field in the pretty_print_context, as can be easily verified in
the previous step.
Hoist the code to append the notes message to the caller.
Up to this point, no functionality change is intended.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 84e9f5bb66..e7e08f42eb 100644 --- a/log-tree.c +++ b/log-tree.c @@ -672,6 +672,9 @@ 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 ((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); |