[PATCH 1/3] diff-merges: cleanup func_by_opt()
Get rid of unneeded "else" statements in func_by_opt().
Signed-off-by: Sergey Organov <sorganov@gmail.com>
---
diff-merges.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/diff-merges.c b/diff-merges.c
index 7f64156b8bfe..780ed08fc87f 100644
--- a/diff-merges.c
+++ b/diff-merges.c
@@ -60,15 +60,15 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
return suppress;
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
return set_first_parent;
- else if (!strcmp(optarg, "separate"))
+ if (!strcmp(optarg, "separate"))
return set_separate;
- else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
+ if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
return set_combined;
- else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
+ if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
return set_dense_combined;
- else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
+ if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
return set_remerge_diff;
- else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
+ if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
return set_to_default;
return NULL;
}
--
2.25.1
Sergey Organov <sorganov@gmail.com>