diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-31 23:02:02 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 05:27:30 +0300 |
| commit | 11aad46432b21f9779a3f303335b8e0a187f98a1 (patch) | |
| tree | 5dd5c6a10593e7d33ebf5438a7f5c5ca9d63e312 /t/t3425-rebase-topology-merges.sh | |
| parent | 5ee4ef8bda516406b0c13df517895321764ad8e4 (diff) | |
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>
Diffstat (limited to 't/t3425-rebase-topology-merges.sh')
| -rwxr-xr-x | t/t3425-rebase-topology-merges.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh index 846f85c27e..5f892e33d7 100755 --- a/t/t3425-rebase-topology-merges.sh +++ b/t/t3425-rebase-topology-merges.sh @@ -109,6 +109,11 @@ test_run_rebase success 'd e n o' '' test_run_rebase success 'd e n o' -m test_run_rebase success 'd n o e' -i +if ! test_have_prereq REBASE_P; then + skip_all='skipping git rebase -p tests, as asked for' + test_done +fi + test_expect_success "rebase -p is no-op in non-linear history" " reset_rebase && git rebase -p d w && |