diff options
| author | Jeff Smith <whydoubt@gmail.com> | 2017-08-09 19:02:56 -0500 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-08-10 15:58:24 +0200 |
| commit | 86a6d358f7a6c2432fde86b9e3c5011a656f20e4 (patch) | |
| tree | 0f43ea3514fba419d5a5d99cf731f96daa2765c0 /ui-log.c | |
| parent | git: update to v2.13.4 (diff) | |
| download | cgit-pink-86a6d358f7a6c2432fde86b9e3c5011a656f20e4.tar.gz cgit-pink-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 '')
| -rw-r--r-- | ui-log.c | 10 |
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) rem_lines = 0; DIFF_OPT_SET(&revs->diffopt, RECURSIVE); - diff_tree_sha1(parent->tree->object.oid.hash, - commit->tree->object.oid.hash, - "", &revs->diffopt); + diff_tree_oid(&parent->tree->object.oid, + &commit->tree->object.oid, + "", &revs->diffopt); diffcore_std(&revs->diffopt); found = !diff_queue_is_empty(); @@ -273,7 +273,7 @@ static void print_commit(struct commit *commit, struct rev_info *revs) strbuf_addstr(&msgbuf, info->msg); strbuf_addch(&msgbuf, '\n'); } - format_display_notes(commit->object.oid.hash, + format_display_notes(&commit->object.oid, &msgbuf, PAGE_ENCODING, 0); strbuf_addch(&msgbuf, '\n'); strbuf_ltrim(&msgbuf); @@ -436,7 +436,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); load_ref_decorations(DECORATE_FULL_REFS); rev.show_decorations = 1; - rev.grep_filter.regflags |= REG_ICASE; + rev.grep_filter.ignore_case = 1; rev.diffopt.detect_rename = 1; rev.diffopt.rename_limit = ctx.cfg.renamelimit; |