diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-06 00:01:51 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-06 00:01:51 +0300 |
commit | 34415c76c8f67c8692090ef4911d1626689e8f38 (patch) | |
tree | 394d71e84f1909532a6a0e1654d3ff314a9bd39b /diff-lib.c | |
parent | 58138d3f266569f945a7abc86fc897111c47640f (diff) | |
parent | d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (diff) |
Merge branch 'so/combine-diff-simplify'
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
Diffstat (limited to 'diff-lib.c')
-rw-r--r-- | diff-lib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/diff-lib.c b/diff-lib.c index 346fdcf0b0..f95c6de75f 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -177,9 +177,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option) i--; if (revs->combine_merges && num_compare_stages == 2) { - show_combined_diff(dpath, 2, - revs->dense_combined_merges, - revs); + show_combined_diff(dpath, 2, revs); free(dpath); continue; } @@ -361,7 +359,7 @@ static int show_modified(struct rev_info *revs, p->parent[1].status = DIFF_STATUS_MODIFIED; p->parent[1].mode = old_entry->ce_mode; oidcpy(&p->parent[1].oid, &old_entry->oid); - show_combined_diff(p, 2, revs->dense_combined_merges, revs); + show_combined_diff(p, 2, revs); free(p); return 0; } |