diff-merges: introduce revs->first_parent_merges flag
This new field allows us to separate format of diff for merges from 'first_parent_only' flag which primary purpose is limiting history traversal. This change further localizes diff format selection logic into the diff-merges.c file. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
3291eea3104e1a1aa64181671da3f9551ec3d59f
3 files changed
+5
-2
diff-merges.c
+2
@@ -73,6 +73,8 @@ void diff_merges_default_to_first_parent(struct rev_info *revs)
73
{
74
if (revs->ignore_merges < 0) /* No -m */
75
revs->ignore_merges = 0;
76
+ if (!revs->combine_merges) /* No -c/--cc" */
77
+ revs->first_parent_merges = 1;
78
}
79
80
void diff_merges_default_to_dense_combined(struct rev_info *revs)
log-tree.c
+2
-2
@@ -922,7 +922,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
922
return 0;
923
else if (opt->combine_merges)
924
return do_diff_combined(opt, commit);
925
- else if (!opt->first_parent_only) {
925
+ else if (!opt->first_parent_merges) {
926
/* If we show multiple diffs, show the parent info */
927
log->parent = parents->item;
928
}
@@ -941,7 +941,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
941
942
/* Set up the log info for the next parent, if any.. */
943
parents = parents->next;
944
- if (!parents || opt->first_parent_only)
944
+ if (!parents || opt->first_parent_merges)
945
break;
946
log->parent = parents->item;
947
opt->loginfo = log;
revision.h
+1
@@ -194,6 +194,7 @@ struct rev_info {
194
combine_merges:1,
195
combined_all_paths:1,
196
dense_combined_merges:1,
197
+ first_parent_merges:1,
198
always_show_header:1;
199
int ignore_merges:2;
200