kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff-merges: refactor set_diff_merges() 

Split set_diff_merges() into separate parsing and execution functions,
the former to be reused for parsing of configuration values later in
the patch series.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sergey Organov 2021-04-13 14:41:15 +03:00 committed by Junio C Hamano
parent 4320815eb9
commit 26a0f58da8
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
diff-merges.c
View File

@ -55,29 +55,35 @@ static void set_dense_combined(struct rev_info *revs)
revs->dense_combined_merges = 1;
}

static diff_merges_setup_func_t func_by_opt(const char *optarg)
{
if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
return suppress;
if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
return set_first_parent;
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
return set_separate;
else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
return set_combined;
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
return set_dense_combined;
else if (!strcmp(optarg, "on"))
return set_to_default;
return NULL;
}

static void set_diff_merges(struct rev_info *revs, const char *optarg)
{
if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) {
suppress(revs);
/* Return early to leave revs->merges_need_diff unset */
return;
}
diff_merges_setup_func_t func = func_by_opt(optarg);

if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
set_first_parent(revs);
else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
set_separate(revs);
else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
set_combined(revs);
else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
set_dense_combined(revs);
else if (!strcmp(optarg, "on"))
set_to_default(revs);
else
if (!func)
die(_("unknown value for --diff-merges: %s"), optarg);

/* The flag is cleared by set_xxx() functions, so don't move this up */
revs->merges_need_diff = 1;
func(revs);

/* NOTE: the merges_need_diff flag is cleared by func() call */
if (func != suppress)
revs->merges_need_diff = 1;
}

/*