From 3291eea3104e1a1aa64181671da3f9551ec3d59f Mon Sep 17 00:00:00 2001 From: Sergey Organov Date: Mon, 21 Dec 2020 18:19:40 +0300 Subject: 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 Signed-off-by: Junio C Hamano --- diff-merges.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'diff-merges.c') diff --git a/diff-merges.c b/diff-merges.c index 24f922cf8a..fb591a9339 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -73,6 +73,8 @@ 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) -- cgit v1.2.3