diff-merges: refactor set_diff_merges()
Split set_diff_merges() into separate parsing and execution functions, the former to be reused for parsing of configuration values later in the patch series. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Apr 13, 2021 at 14:41 UTC
26a0f58da84a7da11f9175144c9a926e7b376349
1 file changed
+21
-15
diff-merges.c
+21
-15
@@ -55,29 +55,35 @@ static void set_dense_combined(struct rev_info *revs)
55
revs->dense_combined_merges = 1;
56
}
57
58
-static void set_diff_merges(struct rev_info *revs, const char *optarg)
58
+static diff_merges_setup_func_t func_by_opt(const char *optarg)
59
{
60
- if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) {
61
- suppress(revs);
62
- /* Return early to leave revs->merges_need_diff unset */
63
- return;
64
- }
65
-
60
+ if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
61
+ return suppress;
62
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
67
- set_first_parent(revs);
63
+ return set_first_parent;
64
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
69
- set_separate(revs);
65
+ return set_separate;
66
else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
71
- set_combined(revs);
67
+ return set_combined;
68
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
73
- set_dense_combined(revs);
69
+ return set_dense_combined;
70
else if (!strcmp(optarg, "on"))
75
- set_to_default(revs);
76
- else
71
+ return set_to_default;
72
+ return NULL;
73
+}
74
+
75
+static void set_diff_merges(struct rev_info *revs, const char *optarg)
76
+{
77
+ diff_merges_setup_func_t func = func_by_opt(optarg);
78
+
79
+ if (!func)
80
die(_("unknown value for --diff-merges: %s"), optarg);
81
79
- /* The flag is cleared by set_xxx() functions, so don't move this up */
80
- revs->merges_need_diff = 1;
82
+ func(revs);
83
+
84
+ /* NOTE: the merges_need_diff flag is cleared by func() call */
85
+ if (func != suppress)
86
+ revs->merges_need_diff = 1;
87
}
88
89
/*