diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-10-31 20:02:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:27:30 (GMT) |
| commit | 11aad46432b21f9779a3f303335b8e0a187f98a1 (patch) | |
| tree | 5dd5c6a10593e7d33ebf5438a7f5c5ca9d63e312 /t/t7517-per-repo-email.sh | |
| parent | 5ee4ef8bda516406b0c13df517895321764ad8e4 (diff) | |
| download | git-11aad46432b21f9779a3f303335b8e0a187f98a1.zip git-11aad46432b21f9779a3f303335b8e0a187f98a1.tar.gz git-11aad46432b21f9779a3f303335b8e0a187f98a1.tar.bz2 | |
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/t7517-per-repo-email.sh')
| -rwxr-xr-x | t/t7517-per-repo-email.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh index 2a22fa7..231b8cc 100755 --- a/t/t7517-per-repo-email.sh +++ b/t/t7517-per-repo-email.sh @@ -72,12 +72,14 @@ test_expect_success 'noop interactive rebase does not care about ident' ' git rebase -i HEAD^ ' -test_expect_success 'fast-forward rebase does not care about ident (preserve)' ' +test_expect_success REBASE_P \ + 'fast-forward rebase does not care about ident (preserve)' ' git checkout -B tmp side-without-commit && git rebase -p master ' -test_expect_success 'non-fast-forward rebase refuses to write commits (preserve)' ' +test_expect_success REBASE_P \ + 'non-fast-forward rebase refuses to write commits (preserve)' ' test_when_finished "git rebase --abort || true" && git checkout -B tmp side-with-commit && test_must_fail git rebase -p master |