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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/builtin/log.c b/builtin/log.c
index a7791c003c9167b98208d720a78f7d435c902b45..63875c3aeec9ff0fdee9d319b2b81c754fe4ef7b 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -600,7 +600,7 @@ static void show_setup_revisions_tweak(struct rev_info *rev,
                                       struct setup_revision_opt *opt)
 {
        if (rev->first_parent_only)
-               diff_merges_default_to_enable(rev);
+               diff_merges_default_to_first_parent(rev);
        else
                diff_merges_default_to_dense_combined(rev);
        if (!rev->diffopt.output_format)
@@ -728,7 +728,7 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
                rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 
        if (rev->first_parent_only)
-               diff_merges_default_to_enable(rev);
+               diff_merges_default_to_first_parent(rev);
 }
 
 int cmd_log(int argc, const char **argv, const char *prefix)

diff --git a/diff-merges.c b/diff-merges.c
index a3bafa92f3e1d0a56873a926d4899f9330e2681b..76c8045797586c661146df1655b974633b87eb23 100644 (file)
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -56,7 +56,7 @@ void diff_merges_setup_revs(struct rev_info *revs)
                die("--combined-all-paths makes no sense without -c or --cc");
 }
 
-void diff_merges_default_to_enable(struct rev_info *revs)
+void diff_merges_default_to_first_parent(struct rev_info *revs)
 {
        if (revs->ignore_merges < 0)            /* No -m */
                revs->ignore_merges = 0;

diff --git a/diff-merges.h b/diff-merges.h
index 6937d46219f1c89a32769a0808516db12adca130..18861dc5480e46024ad3ff03a6bd40b24140c851 100644 (file)
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -17,7 +17,7 @@ void diff_merges_setup_revs(struct rev_info *revs);
 
 void diff_merges_default_to_dense_combined(struct rev_info *revs);
 
-void diff_merges_default_to_enable(struct rev_info *revs);
+void diff_merges_default_to_first_parent(struct rev_info *revs);
 
 
 #endif