undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Sergey Organov 2020-12-21 18:19:48 +03:00 committed by Junio C Hamano
parent d9b1bc6d13
commit a6e66af923
3 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diff-merges.c
View File

@ -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;

2
diff-merges.h
View File

@ -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);

1
revision.c
View File

@ -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;