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

Merge branch 'ob/rebase-cleanup' into next

Browse Source 
Code clean-up.

* ob/rebase-cleanup:
  rebase: move parse_opt_keep_empty() down
  rebase: handle --strategy via imply_merge() as well
  rebase: simplify code related to imply_merge()
This commit is contained in:
Junio C Hamano
2023-10-22 10:39:26 -07:00
parent 0e4787303d 96db17352d
commit 05e14ca4fc
1 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
builtin/rebase.c
View File

@ -376,20 +376,6 @@ static int run_sequencer_rebase(struct rebase_options *opts)
return ret; return ret;
} }
static void imply_merge(struct rebase_options *opts, const char *option);
static int parse_opt_keep_empty(const struct option *opt, const char *arg,
int unset)
{
struct rebase_options *opts = opt->value;
BUG_ON_OPT_ARG(arg);
imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty");
opts->keep_empty = !unset;
opts->type = REBASE_MERGE;
return 0;
}
static int is_merge(struct rebase_options *opts) static int is_merge(struct rebase_options *opts)
{ {
return opts->type == REBASE_MERGE; return opts->type == REBASE_MERGE;
@ -983,6 +969,18 @@ static enum empty_type parse_empty_value(const char *value)
die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value); die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
} }
static int parse_opt_keep_empty(const struct option *opt, const char *arg,
int unset)
{
struct rebase_options *opts = opt->value;
BUG_ON_OPT_ARG(arg);
imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty");
opts->keep_empty = !unset;
return 0;
}
static int parse_opt_empty(const struct option *opt, const char *arg, int unset) static int parse_opt_empty(const struct option *opt, const char *arg, int unset)
{ {
struct rebase_options *options = opt->value; struct rebase_options *options = opt->value;
@ -1491,23 +1489,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.strategy) { if (options.strategy) {
options.strategy = xstrdup(options.strategy); options.strategy = xstrdup(options.strategy);
switch (options.type) { imply_merge(&options, "--strategy");
case REBASE_APPLY:
die(_("--strategy requires --merge or --interactive"));
case REBASE_MERGE:
/* compatible */
break;
case REBASE_UNSPECIFIED:
options.type = REBASE_MERGE;
break;
default:
BUG("unhandled rebase type (%d)", options.type);
}
} }
if (options.type == REBASE_MERGE)
imply_merge(&options, "--merge");
if (options.root && !options.onto_name) if (options.root && !options.onto_name)
imply_merge(&options, "--root without --onto"); imply_merge(&options, "--root without --onto");
@ -1552,7 +1536,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.type == REBASE_UNSPECIFIED) { if (options.type == REBASE_UNSPECIFIED) {
if (!strcmp(options.default_backend, "merge")) if (!strcmp(options.default_backend, "merge"))
imply_merge(&options, "--merge"); options.type = REBASE_MERGE;
else if (!strcmp(options.default_backend, "apply")) else if (!strcmp(options.default_backend, "apply"))
options.type = REBASE_APPLY; options.type = REBASE_APPLY;
else else