Skip to content

Commit a6e66af

Browse files
sorganovgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d9b1bc6 commit a6e66af

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

diff-merges.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ static void set_dense_combined(struct rev_info *revs)
2121
* Public functions. They are in the order they are called.
2222
*/
2323

24-
void diff_merges_init_revs(struct rev_info *revs)
25-
{
26-
}
27-
2824
int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
2925
{
3026
int argcount = 1;

diff-merges.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
struct rev_info;
1111

12-
void diff_merges_init_revs(struct rev_info *revs);
13-
1412
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
1513

1614
void diff_merges_suppress(struct rev_info *revs);

revision.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,6 @@ void repo_init_revisions(struct repository *r,
18141814

18151815
revs->repo = r;
18161816
revs->abbrev = DEFAULT_ABBREV;
1817-
diff_merges_init_revs(revs);
18181817
revs->simplify_history = 1;
18191818
revs->pruning.repo = r;
18201819
revs->pruning.flags.recursive = 1;

0 commit comments

Comments
 (0)