Rename diff_merges_default_to_enable() to
diff_merges_default_to_first_parent() to match its semantics.
Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx>
---
builtin/log.c | 4 ++--
diff-merges.c | 2 +-
diff-merges.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c
index a7791c003c91..63875c3aeec9 100644
--- 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 9dd472803d15..bb08a92e3b36 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -54,7 +54,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 cf411414898d..20b727bd734f 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -11,7 +11,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
--
2.25.1
