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

diff-merges: new function diff_merges_set_dense_combined_if_unset()

Browse Source 
Call it where given functionality is needed instead of direct
checking/tweaking of diff merges related fields.

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:39 +03:00
committed by Junio C Hamano
parent 09322b1da9
commit 3b6c17b5c0
4 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
diff-merges.c
View File

@@ -10,6 +10,13 @@ static void suppress(struct rev_info *revs)
revs->dense_combined_merges = 0;
}
static void set_dense_combined(struct rev_info *revs)
{
revs->combine_merges = 1;
revs->dense_combined_merges = 1;
}
/*
* Public functions. They are in the order they are called.
*/
@@ -39,8 +46,7 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
revs->combine_merges = 1;
} else if (!strcmp(arg, "--cc")) {
revs->diff = 1;
revs->dense_combined_merges = 1;
revs->combine_merges = 1;
set_dense_combined(revs);
} else if (!strcmp(arg, "--no-diff-merges")) {
suppress(revs);
} else if (!strcmp(arg, "--combined-all-paths")) {
@@ -80,6 +86,12 @@ void diff_merges_default_to_dense_combined(struct rev_info *revs)
}
}
void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
{
if (!revs->combine_merges)
set_dense_combined(revs);
}
void diff_merges_setup_revs(struct rev_info *revs)
{
if (revs->combine_merges && revs->ignore_merges < 0)