diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-28 14:42:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 22:22:32 +0200 |
| commit | db4a3f26c373fd73688991fbeb76b2d00b9a470c (patch) | |
| tree | 1787f9abed34e43cb6727779c33c4ed88a975c81 /t/t3422-rebase-incompatible-options.sh | |
| parent | rebase: deprecate --preserve-merges (diff) | |
| download | git-db4a3f26c373fd73688991fbeb76b2d00b9a470c.tar.xz git-db4a3f26c373fd73688991fbeb76b2d00b9a470c.zip | |
tests: mark a couple more test cases as requiring `rebase -p`
The `--preserve-merges` option has been deprecated, and as a consequence
we started to mark test cases that require that option to be supported,
in preparation for removing that support eventually.
Since we marked those test cases, a couple more crept into the test
suite, and with this patch, we mark them, too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3422-rebase-incompatible-options.sh')
| -rwxr-xr-x | t/t3422-rebase-incompatible-options.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index bb78a6ec86..a5868ea152 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -65,12 +65,13 @@ test_rebase_am_only --ignore-whitespace test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 -test_expect_success '--preserve-merges incompatible with --signoff' ' +test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --signoff A ' -test_expect_success '--preserve-merges incompatible with --rebase-merges' ' +test_expect_success REBASE_P \ + '--preserve-merges incompatible with --rebase-merges' ' git checkout B^0 && test_must_fail git rebase --preserve-merges --rebase-merges A ' |