diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 15:19:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 21:47:30 (GMT) |
| commit | 7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a (patch) | |
| tree | 62a61608f95832357632e4b6d9bc17776ab4b684 /diff-merges.c | |
| parent | 18f09473bf8685a1f8db254cff915d4c31e86406 (diff) | |
| download | git-7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a.zip git-7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a.tar.gz git-7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a.tar.bz2 | |
diff-merges: move checks for first_parent_only out of the module
The checks for first_parent_only don't in fact belong to this module,
as the primary purpose of this flag is history traversal limiting, so
get it out of this module and rename the
diff_merges_first_parent_defaults_to_enable()
to
diff_merges_default_to_enable()
to match new semantics.
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 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/diff-merges.c b/diff-merges.c index 9286dbb..a3bafa9 100644 --- a/diff-merges.c +++ b/diff-merges.c @@ -56,19 +56,17 @@ void diff_merges_setup_revs(struct rev_info *revs) die("--combined-all-paths makes no sense without -c or --cc"); } -void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs) +void diff_merges_default_to_enable(struct rev_info *revs) { - if (revs->first_parent_only && revs->ignore_merges < 0) + if (revs->ignore_merges < 0) /* No -m */ revs->ignore_merges = 0; } void diff_merges_default_to_dense_combined(struct rev_info *revs) { - if (revs->ignore_merges < 0) { - /* There was no "-m" variant on the command line */ + if (revs->ignore_merges < 0) { /* No -m */ revs->ignore_merges = 0; - if (!revs->first_parent_only && !revs->combine_merges) { - /* No "--first-parent", "-c", or "--cc" */ + if (!revs->combine_merges) { /* No -c/--cc" */ revs->combine_merges = 1; revs->dense_combined_merges = 1; } |