Update git to v1.8.2.1

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index aaffb4ef279e17cac4a4bedaab16e55a22ad6b3a..8d8b2351b1dd6e4a0c34a3b9f5e8a5d5da5e2fca 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -195,9 +195,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
                                strbuf_addstr(&msgbuf, info->msg);
                                strbuf_addch(&msgbuf, '\n');
                        }
-                       format_note(NULL, commit->object.sha1, &msgbuf,
-                                   PAGE_ENCODING,
-                                   NOTES_SHOW_HEADER | NOTES_INDENT);
+                       format_display_notes(commit->object.sha1,
+                                            &msgbuf, PAGE_ENCODING, 0);
                        strbuf_addch(&msgbuf, '\n');
                        strbuf_ltrim(&msgbuf);
                }
@@ -397,6 +396,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
 
+       init_display_notes(NULL);
        for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                print_commit(commit, &rev);
                free(commit->buffer);