diff-merges: re-arrange functions to match the order they are called in

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@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff-merges.c b/diff-merges.c
index 76c8045797586c661146df1655b974633b87eb23..8325ab880166926f15785f5aa788143833c09e29 100644 (file)
--- 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;
@@ -46,16 +50,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 */
@@ -72,3 +66,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 18861dc5480e46024ad3ff03a6bd40b24140c851..243ef915c4cd5acec594518b5158686592c7555b 100644 (file)
--- 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_first_parent(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_setup_revs(struct rev_info *revs);
 
 #endif