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

diff-merges: make -m/-c/--cc explicitly mutually exclusive

Browse Source 
-c/--cc got precedence over -m only because of external logic where
corresponding flags are checked before that for -m. This is too
error-prone, so add code that explicitly makes these 3 options
mutually exclusive, so that the last option specified on the
command-line gets precedence.

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:50 +03:00
committed by Junio C Hamano
parent 3d2b5f2f49
commit 255a4dacc5
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
diff-merges.c
View File

@ -8,6 +8,7 @@ static void suppress(struct rev_info *revs)
revs->first_parent_merges = 0; revs->first_parent_merges = 0;
revs->combine_merges = 0; revs->combine_merges = 0;
revs->dense_combined_merges = 0; revs->dense_combined_merges = 0;
revs->combined_all_paths = 0;
} }
static void set_separate(struct rev_info *revs) static void set_separate(struct rev_info *revs)
@ -29,12 +30,14 @@ static void set_m(struct rev_info *revs)
static void set_combined(struct rev_info *revs) static void set_combined(struct rev_info *revs)
{ {
suppress(revs);
revs->combine_merges = 1; revs->combine_merges = 1;
revs->dense_combined_merges = 0; revs->dense_combined_merges = 0;
} }
static void set_dense_combined(struct rev_info *revs) static void set_dense_combined(struct rev_info *revs)
{ {
suppress(revs);
revs->combine_merges = 1; revs->combine_merges = 1;
revs->dense_combined_merges = 1; revs->dense_combined_merges = 1;
} }