diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-31 13:02:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 11:27:30 +0900 |
| commit | 11aad46432b21f9779a3f303335b8e0a187f98a1 (patch) | |
| tree | 5dd5c6a10593e7d33ebf5438a7f5c5ca9d63e312 /t/t3418-rebase-continue.sh | |
| parent | t3418: decouple test cases from a previous `rebase -p` test case (diff) | |
| download | git-11aad46432b21f9779a3f303335b8e0a187f98a1.tar.gz git-11aad46432b21f9779a3f303335b8e0a187f98a1.zip | |
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/t3418-rebase-continue.sh')
| -rwxr-xr-x | t/t3418-rebase-continue.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh index 031e3d8ddb..f0025c7810 100755 --- a/t/t3418-rebase-continue.sh +++ b/t/t3418-rebase-continue.sh @@ -106,7 +106,7 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' ' test -f funny.was.run ' -test_expect_success 'rebase passes merge strategy options correctly' ' +test_expect_success REBASE_P 'rebase passes merge strategy options correctly' ' rm -fr .git/rebase-* && git reset --hard commit-new-file-F3-on-topic-branch && test_commit theirs-to-merge && @@ -241,6 +241,6 @@ test_rerere_autoupdate test_rerere_autoupdate -m GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR test_rerere_autoupdate -i -test_rerere_autoupdate --preserve-merges +test_have_prereq !REBASE_P || test_rerere_autoupdate --preserve-merges test_done |