diff options
| author | Sergey Organov <sorganov@gmail.com> | 2022-09-14 22:31:00 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-16 19:21:40 +0300 |
| commit | c7c4f7608afe811ea5c2095d93020639707a8733 (patch) | |
| tree | 467add7279f92e252d87bcf02c252a4e30575032 /diff-merges.c | |
| parent | d3fa443f97e3a8d75b51341e2d5bac380b7422df (diff) | |
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>
Diffstat (limited to 'diff-merges.c')
| -rw-r--r-- | diff-merges.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |