mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff-merges: cleanup func_by_opt()

Browse Source 
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>
This commit is contained in:
Sergey Organov
2022-09-14 22:31:00 +03:00
committed by Junio C Hamano
parent d3fa443f97
commit c7c4f7608a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
diff-merges.c
View File

@ -60,15 +60,15 @@ static diff_merges_setup_func_t func_by_opt(const char *optarg)
return suppress; return suppress;
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent")) if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
return set_first_parent; return set_first_parent;
else if (!strcmp(optarg, "separate")) if (!strcmp(optarg, "separate"))
return set_separate; return set_separate;
else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined")) if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
return set_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; return set_dense_combined;
else if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge")) if (!strcmp(optarg, "r") || !strcmp(optarg, "remerge"))
return set_remerge_diff; return set_remerge_diff;
else if (!strcmp(optarg, "m") || !strcmp(optarg, "on")) if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
return set_to_default; return set_to_default;
return NULL; return NULL;
} }