Junio C Hamano <gitster@xxxxxxxxx> writes:
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@xxxxxxxxx>
> writes:
>
>> From: Johannes Schindelin <johannes.schindelin@xxxxxx>
>>
>> We started marking all of those test cases that require `git rebase -p`
>> to work in the recent past, to allow for skipping them (because the
>> `--preserve-merges` backend is already deprecated and will be removed in
>> one of the next major versions, so it is a bit pointless to test its
>> functionality all the time).
>>
>> This patch marks two previously forgotten test cases with the `REBASE_P`
>> prerequisite, to allow skipping them via setting the environment
>> variable `GIT_TEST_SKIP_REBASE_P`.
>>
>> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
>> ---
>> t/t3422-rebase-incompatible-options.sh | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> Thanks.
Wait. What is the relationship between this one and the part that
touches the same path in db4a3f26 ("tests: mark a couple more test
cases as requiring `rebase -p`", 2019-05-28), which is reachable
even from 'maint'?
