diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:31 (GMT) |
| commit | 3291eea3104e1a1aa64181671da3f9551ec3d59f (patch) | |
| tree | e0b5e5a4361199ff54689f33ec07a5a60fdd0e6d /diff-merges.c | |
| parent | 3b6c17b5c0bd126e3c712f5de909a033d99f1e3a (diff) | |
| download | git-3291eea3104e1a1aa64181671da3f9551ec3d59f.zip git-3291eea3104e1a1aa64181671da3f9551ec3d59f.tar.gz git-3291eea3104e1a1aa64181671da3f9551ec3d59f.tar.bz2 | |
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>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-merges.c b/diff-merges.c index 24f922c..fb591a9 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) |