From d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Tue, 29 Sep 2020 14:31:22 +0300 Subject: 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 Signed-off-by: Junio C Hamano --- diff.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 9443dc1b00..f5eeb55a43 100644 --- a/diff.h +++ b/diff.h @@ -454,11 +454,11 @@ struct combine_diff_path { st_mult(sizeof(struct combine_diff_parent), (n))) void show_combined_diff(struct combine_diff_path *elem, int num_parent, - int dense, struct rev_info *); + struct rev_info *); -void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev); +void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev); -void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); +void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev); void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); -- cgit v1.2.3