Re: [PATCH v2 3/3] rebase: move parse_opt_keep_empty() down
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Aug 15, 2023, 14:01 UTC
- Message-ID
- <8b629666-ca43-4a38-ba70-1c017d547984@gmail.com>
- In-Reply-To
- <20230809171531.2564844-4-oswald.buddenhagen@gmx.de>
Hi Oswald
On 09/08/2023 18:15, Oswald Buddenhagen wrote:
Show 10 quoted lines
> 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(). > > Acked-by: Phillip Wood <phillip.wood123@gmail.com> > Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> > > --- > i'm not sure how to "translate" phillip's informal approval; the > acked-by doesn't seem quite right. please adjust as necessary.
I think we should just delete that trailer, I don't approve of this change any more strongly than I do the rest of the series - they all look like useful improvements to me, thanks for working on them.
Best Wishes
Phillip
Show 48 quoted lines
> Cc: Junio C Hamano <gitster@pobox.com>
> ---
> builtin/rebase.c | 25 ++++++++++++-------------
> 1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 4a093bb125..13ca5a644b 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -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;