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>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
7acf0d06f54043b3b79d5d388ed1c8fb66e2db5a
3 files changed
+11
-9
builtin/log.c
+6
-2
@@ -599,7 +599,10 @@ static int show_tree_object(const struct object_id *oid,
599
static void show_setup_revisions_tweak(struct rev_info *rev,
600
struct setup_revision_opt *opt)
601
{
602
- diff_merges_default_to_dense_combined(rev);
602
+ if (rev->first_parent_only)
603
+ diff_merges_default_to_enable(rev);
604
+ else
605
+ diff_merges_default_to_dense_combined(rev);
606
if (!rev->diffopt.output_format)
607
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
608
}
@@ -724,7 +727,8 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
727
if (!rev->diffopt.output_format && rev->combine_merges)
728
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
729
727
- diff_merges_first_parent_defaults_to_enable(rev);
730
+ if (rev->first_parent_only)
731
+ diff_merges_default_to_enable(rev);
732
}
733
734
int cmd_log(int argc, const char **argv, const char *prefix)
diff-merges.c
+4
-6
@@ -56,19 +56,17 @@ void diff_merges_setup_revs(struct rev_info *revs)
56
die("--combined-all-paths makes no sense without -c or --cc");
57
}
58
59
-void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs)
59
+void diff_merges_default_to_enable(struct rev_info *revs)
60
{
61
- if (revs->first_parent_only && revs->ignore_merges < 0)
61
+ if (revs->ignore_merges < 0) /* No -m */
62
revs->ignore_merges = 0;
63
}
64
65
void diff_merges_default_to_dense_combined(struct rev_info *revs)
66
{
67
- if (revs->ignore_merges < 0) {
68
- /* There was no "-m" variant on the command line */
67
+ if (revs->ignore_merges < 0) { /* No -m */
68
revs->ignore_merges = 0;
70
- if (!revs->first_parent_only && !revs->combine_merges) {
71
- /* No "--first-parent", "-c", or "--cc" */
69
+ if (!revs->combine_merges) { /* No -c/--cc" */
70
revs->combine_merges = 1;
71
revs->dense_combined_merges = 1;
72
}
diff-merges.h
+1
-1
@@ -17,7 +17,7 @@ void diff_merges_setup_revs(struct rev_info *revs);
17
18
void diff_merges_default_to_dense_combined(struct rev_info *revs);
19
20
-void diff_merges_first_parent_defaults_to_enable(struct rev_info *revs);
20
+void diff_merges_default_to_enable(struct rev_info *revs);
21
22
23
#endif