For clarity, define public functions in the order they are called, to
make logic inter-dependencies easier to grok.
Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx>
---
diff-merges.c | 24 ++++++++++++++----------
diff-merges.h | 7 +++----
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index 19b85bfdba6f..a3b732c34717 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -2,6 +2,10 @@
#include "revision.h"
+/*
+ * Public functions. They are in the order they are called.
+ */
+
void diff_merges_init_revs(struct rev_info *revs) {
revs->ignore_merges = -1;
}
@@ -44,16 +48,6 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv) {
return argcount;
}
-void diff_merges_setup_revs(struct rev_info *revs)
-{
- if (revs->combine_merges && revs->ignore_merges < 0)
- revs->ignore_merges = 0;
- if (revs->ignore_merges < 0)
- revs->ignore_merges = 1;
- if (revs->combined_all_paths && !revs->combine_merges)
- die("--combined-all-paths makes no sense without -c or --cc");
-}
-
void diff_merges_default_to_first_parent(struct rev_info *revs) {
if (revs->ignore_merges < 0) /* No -m */
revs->ignore_merges = 0;
@@ -68,3 +62,13 @@ void diff_merges_default_to_dense_combined(struct rev_info *revs) {
}
}
}
+
+void diff_merges_setup_revs(struct rev_info *revs)
+{
+ if (revs->combine_merges && revs->ignore_merges < 0)
+ revs->ignore_merges = 0;
+ if (revs->ignore_merges < 0)
+ revs->ignore_merges = 1;
+ if (revs->combined_all_paths && !revs->combine_merges)
+ die("--combined-all-paths makes no sense without -c or --cc");
+}
diff --git a/diff-merges.h b/diff-merges.h
index 18861dc5480e..243ef915c4cd 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -13,11 +13,10 @@ void diff_merges_init_revs(struct rev_info *revs);
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
-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_first_parent(struct rev_info *revs);
+void diff_merges_default_to_dense_combined(struct rev_info *revs);
+
+void diff_merges_setup_revs(struct rev_info *revs);
#endif
--
2.25.1
