4 files changed, 6 insertions, 5 deletions

@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.12.4
+GIT_VER = 1.8.2.1
 GIT_URL = https://git-core.googlecode.com/files/git-$(GIT_VER).tar.gz
 INSTALL = install
 MAN5_TXT = $(wildcard *.5.txt)
-Subproject 7e2010537e96d0a1144520222f20ba1dc3d6144
+Subproject 5bda18c186e455f8e65f976d3bf333ab1f4b5b5
@@ -36,7 +36,8 @@ void cgit_print_commit(char *hex, const char *prefix)
         }
         info = cgit_parse_commit(commit);
 
-        format_note(NULL, sha1, &notes, PAGE_ENCODING, 0);
+        init_display_notes(NULL);
+        format_display_notes(sha1, &notes, PAGE_ENCODING, 0);
 
         load_ref_decorations(DECORATE_FULL_REFS);
 
@@ -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);