From: Johannes Schindelin <johannes.schinde...@gmx.de>
To prepare for the long game, where the `--preserve-merges` backend will
be dropped eventually, we already introduced the `REBASE_P` prerequisite
to allow saving time by skipping the now-almost-pointless test cases
that verify that that backend works as expected.
Due to the nature of the tests in t3427 (`test_expect_failure` is happy
as long as the scriptlet fails, whether it is for the intended reason or
because `git-rebase--preserve-merges.sh` was deleted), these two test
cases were missed.
When running with GIT_TEST_SKIP_REBASE_P=OhYesPlease, this drops the
overall run time of t3427 on this developer's machine from ~28s to
~8.5s.
Signed-off-by: Johannes Schindelin <johannes.schinde...@gmx.de>
---
t/t3427-rebase-subtree.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index c0ff3241e4..7a37235768 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -64,7 +64,7 @@ test_expect_success 'setup' '
'
# FAILURE: Does not preserve master4.
-test_expect_failure 'Rebase -Xsubtree --preserve-merges --onto commit' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto
commit' '
reset_rebase &&
git checkout -b rebase-preserve-merges to-rebase &&
git rebase -Xsubtree=files_subtree --preserve-merges --onto
files-master master &&
@@ -73,7 +73,7 @@ test_expect_failure 'Rebase -Xsubtree --preserve-merges
--onto commit' '
'
# FAILURE: Does not preserve master4.
-test_expect_failure 'Rebase -Xsubtree --keep-empty --preserve-merges --onto
commit' '
+test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges
--onto commit' '
reset_rebase &&
git checkout -b rebase-keep-empty to-rebase &&
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges
--onto files-master master &&
--
gitgitgadget
