"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. > > diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh > index bb78a6ec86..eb5cb67b06 100755 > --- a/t/t3422-rebase-incompatible-options.sh > +++ b/t/t3422-rebase-incompatible-options.sh > @@ -65,12 +65,12 @@ test_rebase_am_only --ignore-whitespace > test_rebase_am_only --committer-date-is-author-date > test_rebase_am_only -C4 > > -test_expect_success '--preserve-merges incompatible with --signoff' ' > +test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' > git checkout B^0 && > test_must_fail git rebase --preserve-merges --signoff A > ' > > -test_expect_success '--preserve-merges incompatible with --rebase-merges' ' > +test_expect_success REBASE_P '--preserve-merges incompatible with --rebase-merges' ' > git checkout B^0 && > test_must_fail git rebase --preserve-merges --rebase-merges A > '
