diff-merges: cleanup func_by_opt()
Get rid of unneeded "else" statements in func_by_opt(). Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Sep 14, 2022 at 22:31 UTC
c7c4f7608afe811ea5c2095d93020639707a8733
1 file changed
+5
-5
diff-merges.c
+5
-5
@@ -60,15 +60,15 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
60
return suppress;
61
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
62
return set_first_parent;
63
- else if (!strcmp(optarg, "separate"))
63
+ if (!strcmp(optarg, "separate"))
64
return set_separate;
65
- else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
65
+ if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
66
return set_combined;
67
- else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
67
+ if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
68
return set_dense_combined;
69
- else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
69
+ if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
70
return set_remerge_diff;
71
- else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
71
+ if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
72
return set_to_default;
73
return NULL;
74
}