summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-10-17 19:02:46 -0700
committerJunio C Hamano <gitster@pobox.com>2012-10-17 22:42:40 -0700
commit5a664cf2c76ed83166f5f3ce7385e3cb058e8834 (patch)
treed6586d0246e652c4c7909b8bbe7e196d99a40bc9
parentddf333f66cb8b8647a40e5d39731eaf63ee9fd44 (diff)
downloadgit-5a664cf2c76ed83166f5f3ce7385e3cb058e8834.tar.gz
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>
-rw-r--r--log-tree.c3
-rw-r--r--pretty.c3
2 files changed, 3 insertions, 3 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);
diff --git a/pretty.c b/pretty.c
index a53eb532aa..1925e9c3e4 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1417,9 +1417,6 @@ void pretty_print_commit(const struct pretty_print_context *pp,
if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
strbuf_addch(sb, '\n');
- if (pp->notes_message && *pp->notes_message)
- strbuf_addstr(sb, pp->notes_message);
-
free(reencoded);
}