mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
rebase: move parse_opt_keep_empty() down
This moves it right next to parse_opt_empty(), which is a much more logical place. As a side effect, this removes the need for a forward declaration of imply_merge(). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
37e80a2471
commit
96db17352d
|
@ -376,19 +376,6 @@ static int run_sequencer_rebase(struct rebase_options *opts)
|
|||
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;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int is_merge(struct rebase_options *opts)
|
||||
{
|
||||
return opts->type == REBASE_MERGE;
|
||||
|
@ -982,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);
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
struct rebase_options *options = opt->value;
|
||||
|
|
Loading…
Reference in a new issue