about summary refs log tree commit diff stats
path: root/ui-log.c
diff options
context:
space:
mode:
authorJeff Smith2017-08-09 19:02:56 -0500
committerJason A. Donenfeld2017-08-10 15:58:24 +0200
commit86a6d358f7a6c2432fde86b9e3c5011a656f20e4 (patch)
tree0f43ea3514fba419d5a5d99cf731f96daa2765c0 /ui-log.c
parentgit: update to v2.13.4 (diff)
downloadcgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.gz
cgit-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.zip
git: update to v2.14
Numerous changes were made to git functions to use an object_id
structure rather than sending sha1 hashes as raw unsigned character
arrays.  The functions that affect cgit are: parse_object,
lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect,
diff_root_tree_sha1, diff_tree_sha1, and format_display_notes.

Commit b2141fc (config: don't include config.h by default) made it
necessary to that config.h be explicitly included when needed.

Commit 07a3d41 (grep: remove regflags from the public grep_opt API)
removed one way of specifying the ignore-case grep option.

Signed-off-by: Jeff Smith <whydoubt@gmail.com>
Diffstat (limited to 'ui-log.c')
-rw-r--r--ui-log.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui-log.c b/ui-log.c index 3220fd9..2d2bb31 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -150,9 +150,9 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
150 rem_lines = 0; 150 rem_lines = 0;
151 151
152 DIFF_OPT_SET(&revs->diffopt, RECURSIVE); 152 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
153 diff_tree_sha1(parent->tree->object.oid.hash, 153 diff_tree_oid(&parent->tree->object.oid,
154 commit->tree->object.oid.hash, 154 &commit->tree->object.oid,
155 "", &revs->diffopt); 155 "", &revs->diffopt);
156 diffcore_std(&revs->diffopt); 156 diffcore_std(&revs->diffopt);
157 157
158 found = !diff_queue_is_empty(); 158 found = !diff_queue_is_empty();
@@ -273,7 +273,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
273 strbuf_addstr(&msgbuf, info->msg); 273 strbuf_addstr(&msgbuf, info->msg);
274 strbuf_addch(&msgbuf, '\n'); 274 strbuf_addch(&msgbuf, '\n');
275 } 275 }
276 format_display_notes(commit->object.oid.hash, 276 format_display_notes(&commit->object.oid,
277 &msgbuf, PAGE_ENCODING, 0); 277 &msgbuf, PAGE_ENCODING, 0);
278 strbuf_addch(&msgbuf, '\n'); 278 strbuf_addch(&msgbuf, '\n');
279 strbuf_ltrim(&msgbuf); 279 strbuf_ltrim(&msgbuf);
@@ -436,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
436 setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); 436 setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
437 load_ref_decorations(DECORATE_FULL_REFS); 437 load_ref_decorations(DECORATE_FULL_REFS);
438 rev.show_decorations = 1; 438 rev.show_decorations = 1;
439 rev.grep_filter.regflags |= REG_ICASE; 439 rev.grep_filter.ignore_case = 1;
440 440
441 rev.diffopt.detect_rename = 1; 441 rev.diffopt.detect_rename = 1;
442 rev.diffopt.rename_limit = ctx.cfg.renamelimit; 442 rev.diffopt.rename_limit = ctx.cfg.renamelimit;