After getting rid of 'ignore_meres' field, the diff_merges_init_revs()
function became empty. Get rid of it.
Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx>
---
diff-merges.c | 3 ---
diff-merges.h | 2 --
revision.c | 1 -
3 files changed, 6 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index 19cdad1aa4a1..29818abcc00e 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -19,9 +19,6 @@ static void set_dense_combined(struct rev_info *revs) {
* Public functions. They are in the order they are called.
*/
-void diff_merges_init_revs(struct rev_info *revs) {
-}
-
int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
int argcount;
const char *optarg;
diff --git a/diff-merges.h b/diff-merges.h
index ae1cc8ef9410..9c69b8f3bd69 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -3,8 +3,6 @@
struct rev_info;
-void diff_merges_init_revs(struct rev_info *revs);
-
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
void diff_merges_suppress(struct rev_info *revs);
diff --git a/revision.c b/revision.c
index 5a0e3d6ad542..46645ca0b6df 100644
--- a/revision.c
+++ b/revision.c
@@ -1814,7 +1814,6 @@ void repo_init_revisions(struct repository *r,
revs->repo = r;
revs->abbrev = DEFAULT_ABBREV;
- diff_merges_init_revs(revs);
revs->simplify_history = 1;
revs->pruning.repo = r;
revs->pruning.flags.recursive = 1;
--
2.25.1
