Update git to v1.8.2.1

This requires a small change to how we handle notes, but otherwise just
works.

Note that we can't use anything from v1.8.0 until v1.8.2.1 because some
of the symbols that we need for graph drawing were made private in
v1.8.0 and this was not reverted until v1.8.2.1.

Signed-off-by: John Keeping <john@keeping.me.uk>

1 files changed, 3 insertions, 3 deletions

diff --git a/ui-log.c b/ui-log.c
index aaffb4e..8d8b235 100644
--- 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);