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@xxxxxxxxx>
---
diff-merges.c | 2 ++
log-tree.c | 4 ++--
revision.h | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index 899f9e905d3c..c99d77a318dc 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -67,6 +67,8 @@ void diff_merges_suppress(struct rev_info *revs) {
void diff_merges_default_to_first_parent(struct rev_info *revs) {
if (revs->ignore_merges < 0) /* No -m */
revs->ignore_merges = 0;
+ if (!revs->combine_merges) /* No -c/--cc" */
+ revs->first_parent_merges = 1;
}
void diff_merges_default_to_dense_combined(struct rev_info *revs) {
diff --git a/log-tree.c b/log-tree.c
index 1927f917ce94..3fdc0fc64bfb 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -922,7 +922,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
return 0;
else if (opt->combine_merges)
return do_diff_combined(opt, commit);
- else if (!opt->first_parent_only) {
+ else if (!opt->first_parent_merges) {
/* If we show multiple diffs, show the parent info */
log->parent = parents->item;
}
@@ -941,7 +941,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
/* Set up the log info for the next parent, if any.. */
parents = parents->next;
- if (!parents || opt->first_parent_only)
+ if (!parents || opt->first_parent_merges)
break;
log->parent = parents->item;
opt->loginfo = log;
diff --git a/revision.h b/revision.h
index f6bf860d19e5..ba2aef79215e 100644
--- a/revision.h
+++ b/revision.h
@@ -194,6 +194,7 @@ struct rev_info {
combine_merges:1,
combined_all_paths:1,
dense_combined_merges:1,
+ first_parent_merges:1,
always_show_header:1;
int ignore_merges:2;
--
2.25.1
