Re: [PATCH 1/1] t3422: mark two test cases as requiring support for `--preserve-merges`
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 25, 2019, 16:44 UTC
- Message-ID
- <xmqqpnlyoyh9.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <xmqq8ssmqe02.fsf@gitster-ct.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 21 quoted lines
> "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> > writes: > >> From: Johannes Schindelin <johannes.schindelin@gmx.de> >> >> 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@gmx.de> >> --- >> 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'?