tests: optionally skip `git rebase -p` tests
commit11aad46432b21f9779a3f303335b8e0a187f98a1
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 31 Oct 2018 20:02:02 +0000 (31 13:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Nov 2018 02:27:30 +0000 (2 11:27 +0900)
tree5dd5c6a10593e7d33ebf5438a7f5c5ca9d63e312
parent5ee4ef8bda516406b0c13df517895321764ad8e4
tests: optionally skip `git rebase -p` tests

The `--preserve-merges` mode of the `rebase` command is slated to be
deprecated soon, as the more powerful `--rebase-merges` mode is
available now, and the latter was designed with the express intent to
address the shortcomings of `--preserve-merges`' design (e.g. the
inability to reorder commits in an interactive rebase).

As such, we will eventually even remove the `--preserve-merges` support,
and along with it, its tests.

In preparation for this, and also to allow the Windows phase of our
automated tests to save some well-needed time when running the test
suite, this commit introduces a new prerequisite REBASE_P, which can be
forced to being unmet by setting the environment variable
`GIT_TEST_SKIP_REBASE_P` to any non-empty string.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 files changed:
t/t3404-rebase-interactive.sh
t/t3408-rebase-multi-line.sh
t/t3409-rebase-preserve-merges.sh
t/t3410-rebase-preserve-dropped-merges.sh
t/t3411-rebase-preserve-around-merges.sh
t/t3412-rebase-root.sh
t/t3414-rebase-preserve-onto.sh
t/t3418-rebase-continue.sh
t/t3421-rebase-topology-linear.sh
t/t3425-rebase-topology-merges.sh
t/t5520-pull.sh
t/t7505-prepare-commit-msg-hook.sh
t/t7517-per-repo-email.sh
t/test-lib.sh