diff options
Diffstat (limited to 'ui-log.c')
-rw-r--r-- | ui-log.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -119,8 +119,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) | |||
119 | struct commit_list *parents = commit->parents; | 119 | struct commit_list *parents = commit->parents; |
120 | struct commit *parent; | 120 | struct commit *parent; |
121 | int found = 0, saved_fmt; | 121 | int found = 0, saved_fmt; |
122 | unsigned saved_flags = revs->diffopt.flags; | 122 | struct diff_flags saved_flags = revs->diffopt.flags; |
123 | |||
124 | 123 | ||
125 | /* Always show if we're not in "follow" mode with a single file. */ | 124 | /* Always show if we're not in "follow" mode with a single file. */ |
126 | if (!ctx.qry.follow) | 125 | if (!ctx.qry.follow) |
@@ -149,7 +148,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) | |||
149 | add_lines = 0; | 148 | add_lines = 0; |
150 | rem_lines = 0; | 149 | rem_lines = 0; |
151 | 150 | ||
152 | DIFF_OPT_SET(&revs->diffopt, RECURSIVE); | 151 | revs->diffopt.flags.recursive = 1; |
153 | diff_tree_oid(&parent->tree->object.oid, | 152 | diff_tree_oid(&parent->tree->object.oid, |
154 | &commit->tree->object.oid, | 153 | &commit->tree->object.oid, |
155 | "", &revs->diffopt); | 154 | "", &revs->diffopt); |
@@ -434,7 +433,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
434 | rev.ignore_missing = 1; | 433 | rev.ignore_missing = 1; |
435 | rev.simplify_history = 1; | 434 | rev.simplify_history = 1; |
436 | setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); | 435 | setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); |
437 | load_ref_decorations(DECORATE_FULL_REFS); | 436 | load_ref_decorations(NULL, DECORATE_FULL_REFS); |
438 | rev.show_decorations = 1; | 437 | rev.show_decorations = 1; |
439 | rev.grep_filter.ignore_case = 1; | 438 | rev.grep_filter.ignore_case = 1; |
440 | 439 | ||