diff-merges: get rid of now empty diff_merges_init_revs()

After getting rid of 'ignore_merges' field, the diff_merges_init_revs()
function became empty. Get rid of it.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff-merges.c b/diff-merges.c
index eff54cca8287abff5f9c47c71cdd3236387df0b8..34d7ed7c70b70bd07ce0555b02576047caf06336 100644 (file)
--- 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 f92de137d3a0be0370a09892cb30086b27629a18..659467c99a4f1cbde781c633af7a87ecc287a435 100644 (file)
--- 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 5a0e3d6ad54251ad4f674a0e6c80070cd45efc85..46645ca0b6dfa124eb4d43f580e485f63abda482 100644 (file)
--- 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;