diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 14:01:51 -0700 |
| commit | 34415c76c8f67c8692090ef4911d1626689e8f38 (patch) | |
| tree | 394d71e84f1909532a6a0e1654d3ff314a9bd39b /builtin | |
| parent | Merge branch 'js/default-branch-name-part-2' (diff) | |
| parent | diff: get rid of redundant 'dense' argument (diff) | |
| download | tgif-34415c76c8f67c8692090ef4911d1626689e8f38.tar.xz | |
Merge branch 'so/combine-diff-simplify'
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/diff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index cb98811c21..cd4083fed9 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -203,8 +203,7 @@ static int builtin_diff_combined(struct rev_info *revs, revs->dense_combined_merges = revs->combine_merges = 1; for (i = 1; i < ents; i++) oid_array_append(&parents, &ent[i].item->oid); - diff_tree_combined(&ent[0].item->oid, &parents, - revs->dense_combined_merges, revs); + diff_tree_combined(&ent[0].item->oid, &parents, revs); oid_array_clear(&parents); return 0; } |