about summary refs log tree commit diff stats
path: root/ui-log.c
diff options
context:
space:
mode:
authorJohn Keeping2013-04-08 09:00:22 +0100
committerJason A. Donenfeld2013-04-08 15:41:38 +0200
commit849ecd961df9454d6f849eac34e6f501395c4f01 (patch)
tree6b7dbd83035c45c8afb34c6607738cf42c8c8d8d /ui-log.c
parentui-blob: don't segfault when no path is given (diff)
downloadcgit-849ecd961df9454d6f849eac34e6f501395c4f01.tar.gz
cgit-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 'ui-log.c')
-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)
195 strbuf_addstr(&msgbuf, info->msg); 195 strbuf_addstr(&msgbuf, info->msg);
196 strbuf_addch(&msgbuf, '\n'); 196 strbuf_addch(&msgbuf, '\n');
197 } 197 }
198 format_note(NULL, commit->object.sha1, &msgbuf, 198 format_display_notes(commit->object.sha1,
199 PAGE_ENCODING, 199 &msgbuf, PAGE_ENCODING, 0);
200 NOTES_SHOW_HEADER | NOTES_INDENT);
201 strbuf_addch(&msgbuf, '\n'); 200 strbuf_addch(&msgbuf, '\n');
202 strbuf_ltrim(&msgbuf); 201 strbuf_ltrim(&msgbuf);
203 } 202 }
@@ -397,6 +396,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
397 commit->parents = NULL; 396 commit->parents = NULL;
398 } 397 }
399 398
399 init_display_notes(NULL);
400 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 400 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
401 print_commit(commit, &rev); 401 print_commit(commit, &rev);
402 free(commit->buffer); 402 free(commit->buffer);