[PATCH v3 20/32] diff-merges: get rid of now empty diff_merges_init_revs()
From: Sergey Organov <hidden>
Date: 2020-12-21 18:13:39
Subsystem:
the rest · Maintainer:
Linus Torvalds
After getting rid of 'ignore_merges' field, the diff_merges_init_revs() function became empty. Get rid of it. Signed-off-by: Sergey Organov <redacted> --- diff-merges.c | 4 ---- diff-merges.h | 2 -- revision.c | 1 - 3 files changed, 7 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index eff54cca8287..34d7ed7c70b7 100644
--- a/diff-merges.c
+++ b/diff-merges.c@@ -21,10 +21,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 = 1;
diff --git a/diff-merges.h b/diff-merges.h
index f92de137d3a0..659467c99a4f 100644
--- a/diff-merges.h
+++ b/diff-merges.h@@ -9,8 +9,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