aboutsummaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-20 13:59:36 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-20 19:57:02 -0800
commit66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491 (patch)
tree3dae0edece540e07d06146bb6a5dbf5f6873aec6 /pretty.c
parent9504f3d3d2e62cb6fba9e7c61c6fe69dec9053a4 (diff)
downloadgit-66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491.tar.gz
git-66b2ed09c2f0f212c5cd5c095c1f1052ecbb9491.tar.xz
Fix "log" family not to be too agressive about showing notes
Giving "Notes" information in the default output format of "log" and "show" is a sensible progress (the user has asked for it by having the notes), but for some commands (e.g. "format-patch") spewing notes into the formatted commit log message without being asked is too aggressive. Enable notes output only for "log", "show", "whatchanged" by default and only when the user didn't ask any specific --pretty/--format from the command line; users can explicitly override this default with --show-notes and --no-notes option. Parts of tests are taken from Jeff King's fix. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 8f5bd1ab7..b2ee7fe9d 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1094,7 +1094,7 @@ void pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit,
if (fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body)
strbuf_addch(sb, '\n');
- if (fmt != CMIT_FMT_ONELINE)
+ if (context->show_notes)
get_commit_notes(commit, sb, encoding,
NOTES_SHOW_HEADER | NOTES_INDENT);