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>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
564a4fc8471b41fc05bda16e4bbb02a99b515cbf
2 files changed
+16
-13
diff-merges.c
+14
-10
@@ -2,6 +2,10 @@
2
3
#include "revision.h"
4
5
+/*
6
+ * Public functions. They are in the order they are called.
7
+ */
8
+
9
void diff_merges_init_revs(struct rev_info *revs)
10
{
11
revs->ignore_merges = -1;
@@ -46,16 +50,6 @@ int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
50
return argcount;
51
}
52
49
-void diff_merges_setup_revs(struct rev_info *revs)
50
-{
51
- if (revs->combine_merges && revs->ignore_merges < 0)
52
- revs->ignore_merges = 0;
53
- if (revs->ignore_merges < 0)
54
- revs->ignore_merges = 1;
55
- if (revs->combined_all_paths && !revs->combine_merges)
56
- die("--combined-all-paths makes no sense without -c or --cc");
57
-}
58
-
53
void diff_merges_default_to_first_parent(struct rev_info *revs)
54
{
55
if (revs->ignore_merges < 0) /* No -m */
@@ -72,3 +66,13 @@ void diff_merges_default_to_dense_combined(struct rev_info *revs)
66
}
67
}
68
}
69
+
70
+void diff_merges_setup_revs(struct rev_info *revs)
71
+{
72
+ if (revs->combine_merges && revs->ignore_merges < 0)
73
+ revs->ignore_merges = 0;
74
+ if (revs->ignore_merges < 0)
75
+ revs->ignore_merges = 1;
76
+ if (revs->combined_all_paths && !revs->combine_merges)
77
+ die("--combined-all-paths makes no sense without -c or --cc");
78
+}
diff-merges.h
+2
-3
@@ -13,11 +13,10 @@ void diff_merges_init_revs(struct rev_info *revs);
13
14
int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
15
16
-void diff_merges_setup_revs(struct rev_info *revs);
16
+void diff_merges_default_to_first_parent(struct rev_info *revs);
17
18
void diff_merges_default_to_dense_combined(struct rev_info *revs);
19
20
-void diff_merges_default_to_first_parent(struct rev_info *revs);
21
-
20
+void diff_merges_setup_revs(struct rev_info *revs);
21
22
#endif