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

diff-merges: move checks for first_parent_only out of the module

Browse Source 
The checks for first_parent_only don't in fact belong to this module,
as the primary purpose of this flag is history traversal limiting, so
get it out of this module and rename the

diff_merges_first_parent_defaults_to_enable()

to

diff_merges_default_to_enable()

to match new semantics.

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:35 +03:00
committed by Junio C Hamano
parent 18f09473bf
commit 7acf0d06f5
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
diff-merges.c
View File

@@ -56,19 +56,17 @@ void diff_merges_setup_revs(struct rev_info *revs)
die("--combined-all-paths makes no sense without -c or --cc");
}
void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
void diff_merges_default_to_enable(struct rev_info *revs)
{
if (revs->first_parent_only && revs->ignore_merges < 0)
if (revs->ignore_merges < 0) /* No -m */
revs->ignore_merges = 0;
}
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 */
if (revs->ignore_merges < 0) { /* No -m */
revs->ignore_merges = 0;
if (!revs->first_parent_only && !revs->combine_merges) {
/* No "--first-parent", "-c", or "--cc" */
if (!revs->combine_merges) { /* No -c/--cc" */
revs->combine_merges = 1;
revs->dense_combined_merges = 1;
}