From: Sergey Organov <sorganov@gmail.com>
Date: Wed, 14 Sep 2022 19:31:00 +0000 (+0300)
Subject: diff-merges: cleanup func_by_opt()
X-Git-Tag: v2.39.0-rc0~136^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7c4f7608afe811ea5c2095d93020639707a8733;p=thirdparty%2Fgit.git

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>
---

diff --git a/diff-merges.c b/diff-merges.c
index 7f64156b8b..780ed08fc8 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;
 }