diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:48 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:31 -0800 |
| commit | a6e66af923d54f44bc7d0a404109e900a6a1cb60 (patch) | |
| tree | 155d1ecca8465020b614d2f430871a2effc2adc4 | |
| parent | diff-merges: group diff-merge flags next to each other inside 'rev_info' (diff) | |
| download | tgif-a6e66af923d54f44bc7d0a404109e900a6a1cb60.tar.xz | |
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>
| -rw-r--r-- | diff-merges.c | 4 | ||||
| -rw-r--r-- | diff-merges.h | 2 | ||||
| -rw-r--r-- | revision.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/diff-merges.c b/diff-merges.c index eff54cca82..34d7ed7c70 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 f92de137d3..659467c99a 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 5a0e3d6ad5..46645ca0b6 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; |