mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-merges: rename all functions to have common prefix

Browse Source 
Use the same "diff_merges" prefix for all the diff merges function
names.

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:34 +03:00
committed by Junio C Hamano
parent a37eec6333
commit 18f09473bf
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
diff-merges.c
View File

@ -2,12 +2,12 @@
#include "revision.h"
void init_diff_merge_revs(struct rev_info *revs)
void diff_merges_init_revs(struct rev_info *revs)
{
revs->ignore_merges = -1;
}
int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
{
int argcount = 1;
const char *optarg;
@ -46,7 +46,7 @@ int parse_diff_merge_opts(struct rev_info *revs, const char **argv)
return argcount;
}
void setup_diff_merges_revs(struct rev_info *revs)
void diff_merges_setup_revs(struct rev_info *revs)
{
if (revs->combine_merges && revs->ignore_merges < 0)
revs->ignore_merges = 0;
@ -56,13 +56,13 @@ void setup_diff_merges_revs(struct rev_info *revs)
die("--combined-all-paths makes no sense without -c or --cc");
}
void rev_diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
{
if (revs->first_parent_only && revs->ignore_merges < 0)
revs->ignore_merges = 0;
}
void rev_diff_merges_default_to_dense_combined(struct rev_info *revs)
void diff_merges_default_to_dense_combined(struct rev_info *revs)
{
if (revs->ignore_merges < 0) {
/* There was no "-m" variant on the command line */