summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-22 16:08:01 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-22 16:08:01 -0800
commit67bc7407211d26de518811dafc2c1cf2e6124709 (patch)
tree6fffca8665145d1f3164abce6d980f8c537e1343 /pretty.c
parentf986eecde1e59fc4cc2b0b761ffc0fe563dad267 (diff)
parent7dccadf363f9d9ff564ad34117266b2d557a2bc8 (diff)
downloadgit-67bc7407211d26de518811dafc2c1cf2e6124709.tar.gz
Merge branch 'jc/maint-limit-note-output'
* jc/maint-limit-note-output: Fix "log --oneline" not to show notes Fix "log" family not to be too agressive about showing notes
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 9001379a9d..d493cade26 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);