diff-merges: rename diff_merges_default_to_enable() to match semantics
Rename diff_merges_default_to_enable() to diff_merges_default_to_first_parent() to match its 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
4f54544d736e286538ebef0d3120c164f80f04c1
3 files changed
+4
-4
builtin/log.c
+2
-2
@@ -600,7 +600,7 @@ static void show_setup_revisions_tweak(struct rev_info *rev,
600
struct setup_revision_opt *opt)
601
{
602
if (rev->first_parent_only)
603
- diff_merges_default_to_enable(rev);
603
+ diff_merges_default_to_first_parent(rev);
604
else
605
diff_merges_default_to_dense_combined(rev);
606
if (!rev->diffopt.output_format)
@@ -728,7 +728,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
728
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
729
730
if (rev->first_parent_only)
731
- diff_merges_default_to_enable(rev);
731
+ diff_merges_default_to_first_parent(rev);
732
}
733
734
int cmd_log(int argc, const char **argv, const char *prefix)
diff-merges.c
+1
-1
@@ -56,7 +56,7 @@ 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_default_to_enable(struct rev_info *revs)
59
+void diff_merges_default_to_first_parent(struct rev_info *revs)
60
{
61
if (revs->ignore_merges < 0) /* No -m */
62
revs->ignore_merges = 0;
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_default_to_enable(struct rev_info *revs);
20
+void diff_merges_default_to_first_parent(struct rev_info *revs);
21
22
23
#endif