summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-09-29 11:31:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-29 18:54:53 (GMT)
commitd01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (patch)
treee6be75b3910a0be3cdc0f1c5e69c1890ea9b11c3 /diff.h
parent47ae905ffb98cc4d4fd90083da6bc8dab55d9ecc (diff)
downloadgit-d01141de5ab02cf4a156183ef4dc5ee8bf2638a3.zip
git-d01141de5ab02cf4a156183ef4dc5ee8bf2638a3.tar.gz
git-d01141de5ab02cf4a156183ef4dc5ee8bf2638a3.tar.bz2
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 'diff.h')
-rw-r--r--diff.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/diff.h b/diff.h
index 9443dc1..f5eeb55 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);