Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -119,7 +119,8 @@ 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; - struct diff_flags saved_flags = revs->diffopt.flags; + unsigned saved_flags = revs->diffopt.flags; + /* Always show if we're not in "follow" mode with a single file. */ if (!ctx.qry.follow) @@ -148,7 +149,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) add_lines = 0; rem_lines = 0; - revs->diffopt.flags.recursive = 1; + DIFF_OPT_SET(&revs->diffopt, RECURSIVE); diff_tree_oid(&parent->tree->object.oid, &commit->tree->object.oid, "", &revs->diffopt); @@ -433,7 +434,7 @@ 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(NULL, DECORATE_FULL_REFS); + load_ref_decorations(DECORATE_FULL_REFS); rev.show_decorations = 1; rev.grep_filter.ignore_case = 1; |