diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-09-29 14:31:22 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-29 11:54:53 -0700 |
| commit | d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (patch) | |
| tree | e6be75b3910a0be3cdc0f1c5e69c1890ea9b11c3 /builtin | |
| parent | Git 2.28 (diff) | |
| download | tgif-d01141de5ab02cf4a156183ef4dc5ee8bf2638a3.tar.xz | |
diff: get rid of redundant 'dense' argument
Get rid of 'dense' argument that is redundant for every function that has
'struct rev_info *rev' argument as well, as the value of 'dense' passed is
always taken from 'rev->dense_combined_merges' field.
The only place where this was not the case is in 'submodule.c' where
'diff_tree_combined_merge()' was called with '1' for 'dense' argument. However,
at that call the 'revs' instance used is local to the function, and we now just
set 'revs->dense_combined_merges' to 1 in this local instance.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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; } |