From: Phillip Wood Date: Tue, 07 Sep 2021 15:31:01 GMT Subject: Re: [PATCH v2 5/7] rebase: drop support for `--preserve-merges` Message-ID: <86cbe5b9-1a9e-0616-2d66-3130fcb9afb9@gmail.com> In-Reply-To: Hi Dscho On 07/09/2021 13:32, Johannes Schindelin wrote: > Hi Phillip, > > On Mon, 6 Sep 2021, Phillip Wood wrote: > >> Hi dscho >> >> On 01/09/2021 12:57, Johannes Schindelin via GitGitGadget wrote: >>> From: Johannes Schindelin >>> >>> 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. Sure I was just wondering if we could simplify things by using something like OPT_BOOL rather than OPT_CALLBACK_F for "--am", "-i" and "-m". I haven't looked too closely though Thanks again for this series Best Wishes Phillip > Thanks, > Dscho >