diff options
author | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2018-03-22 11:32:53 +0100 |
commit | 343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4 (patch) | |
tree | 2be5d6faa22089f8d1b0c1d7e14f283550130370 /ui-log.c | |
parent | e4803632f41cc3f09af6a88511b1d6359be3d325 (diff) | |
parent | 33414d7869aa55aaccd45cdb82268d454cb79863 (diff) | |
download | cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.gz cgit-343a8b8ee33f9a181e662fc0e3a3979dd9b52dd4.tar.xz |
Merge branch 'master' of https://git.zx2c4.com/cgit into local
Diffstat (limited to 'ui-log.c')
-rw-r--r-- | ui-log.c | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -119,8 +119,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) struct commit_list *parents = commit->parents; struct commit *parent; int found = 0, saved_fmt; - unsigned saved_flags = revs->diffopt.flags; - + struct diff_flags saved_flags = revs->diffopt.flags; /* Always show if we're not in "follow" mode with a single file. */ if (!ctx.qry.follow) @@ -149,10 +148,10 @@ static int show_commit(struct commit *commit, struct rev_info *revs) add_lines = 0; rem_lines = 0; - DIFF_OPT_SET(&revs->diffopt, RECURSIVE); - diff_tree_sha1(parent->tree->object.oid.hash, - commit->tree->object.oid.hash, - "", &revs->diffopt); + revs->diffopt.flags.recursive = 1; + diff_tree_oid(&parent->tree->object.oid, + &commit->tree->object.oid, + "", &revs->diffopt); diffcore_std(&revs->diffopt); found = !diff_queue_is_empty(); @@ -273,7 +272,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); @@ -434,9 +433,9 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern rev.ignore_missing = 1; rev.simplify_history = 1; setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); - load_ref_decorations(DECORATE_FULL_REFS); + load_ref_decorations(NULL, 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; |