Re: [PATCH 2/8] rebase: move parse_opt_keep_empty() down
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Mar 23, 2023, 19:39 UTC
- Message-ID
- <28e9e0fe-3a00-50f7-2204-57f69a20c693@dunelm.org.uk>
- In-Reply-To
- <20230323162235.995574-3-oswald.buddenhagen@gmx.de>
Hi Oswald On 23/03/2023 16:22, Oswald Buddenhagen wrote:
> 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().
This looks good, it is nice to get rid of that forward declaration
Best Wishes
Phillip
Show 48 quoted lines
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
> ---
> builtin/rebase.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 8ffea0f0d8..491759db19 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -362,19 +362,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;
> @@ -969,6 +956,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;