summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-06 03:40:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-06 03:40:39 (GMT)
commit7b75b331f6744fbf953fe8913703378ef86a2189 (patch)
tree25154056da08462508e529a7ba92073775d295fd /pretty.c
parent5d680a67d7909c89af96eba4a2d77abed606292b (diff)
parent22a3d060937072b0f197a8084af879c753c68fe7 (diff)
downloadgit-7b75b331f6744fbf953fe8913703378ef86a2189.zip
git-7b75b331f6744fbf953fe8913703378ef86a2189.tar.gz
git-7b75b331f6744fbf953fe8913703378ef86a2189.tar.bz2
Merge branch 'js/notes'
* js/notes: git-notes: fix printing of multi-line notes notes: fix core.notesRef documentation Add an expensive test for git-notes Speed up git notes lookup Add a script to edit/inspect notes Introduce commit notes Conflicts: pretty.c
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index cc460b5..8d4dbc9 100644
--- a/pretty.c
+++ b/pretty.c
@@ -6,6 +6,7 @@
#include "string-list.h"
#include "mailmap.h"
#include "log-tree.h"
+#include "notes.h"
#include "color.h"
static char *user_format;
@@ -920,5 +921,9 @@ 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)
+ get_commit_notes(commit, sb, encoding);
+
free(reencoded);
}