Re: [PATCH v2 5/7] rebase: drop support for `--preserve-merges`

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 7, 2021, 12:32 UTC
Message-ID: <nycvar.QRO.7.76.6.2109071430320.55@tvgsbejvaqbjf.bet>
In-Reply-To: <d93a750a-9faf-c91a-c9f7-e968c7ed40f5@gmail.com>

Hi Phillip,

On Mon, 6 Sep 2021, Phillip Wood wrote:

Show 14 quoted lines

> Hi dscho
>
> On 01/09/2021 12:57, Johannes Schindelin via GitGitGadget wrote:
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > This option was deprecated in favor of `--rebase-merges` some time ago,
> > and now we retire it.
>
> This all looks good to me. I did see the comment below in builtin/rebase.c
> that could be tweaked if you reroll, but it is a very minor issue.
>
> /* -i followed by -p is still explicitly interactive, but -p alone is not */
> static int parse_opt_interactive(const struct option *opt, const char *arg,
>                                  int unset)

Right, without `-p` this comment does not make sense anymore. But once I replace the `-p` by `-r`, it _does_ make sense: `git rebase -r` is not interactive, but `git rebase -ir` _is_.

> I do wonder if we need these option parsing functions now but that is a
> question for another day.

As the function parses the `-i`/`--interactive` option, which is not going anywhere, we still need it.

Thanks, Dscho