about summary refs log tree commit diff
path: root/ui-log.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-08 09:00:22 +0100
committerJason A. Donenfeld <Jason@zx2c4.com>2013-04-08 15:41:38 +0200
commit849ecd961df9454d6f849eac34e6f501395c4f01 (patch)
tree6b7dbd83035c45c8afb34c6607738cf42c8c8d8d /ui-log.c
parentui-blob: don't segfault when no path is given (diff)
downloadcgit-pink-849ecd961df9454d6f849eac34e6f501395c4f01.tar.gz
cgit-pink-849ecd961df9454d6f849eac34e6f501395c4f01.zip
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>
Diffstat (limited to '')
-rw-r--r--ui-log.c6
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);