Re: [PATCH 3/3] tests: optionally skip `git rebase -p` tests
- Date: Thu, 01 Nov 2018 15:12:22 +0900
- From: Junio C Hamano <gitster@xxxxxxxxx>
- Subject: Re: [PATCH 3/3] tests: optionally skip `git rebase -p` tests
"Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
> The `--preserve-merges` mode of the `rebase` command is slated to be
> deprecated soon, ...
Is everybody on board on this statement? I vaguely recall that some
people wanted to have something different from what rebase-merges
does (e.g. wrt first-parent history), and extending perserve-merges
might be one way to do so.
I do not mind at all if the way forward were to extend rebase-merges
for any future features. To me, it is preferrable having to deal
with just one codepath than two written in different languages.
I just want to make sure we know everybody is on board the plan that
we will eventually remove preserve-merges, tell those who want to
use it to switch to rebase-merges, and we will extend rebase-merges
when they raise issues with it saying that they cannot do something
preserve-merges would have served them well with rebase-merges.