diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2021-09-07 21:05:04 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-07 21:45:32 -0700 |
| commit | aa4df107e72a7a8bd2f149ecb58edfe9dde8576b (patch) | |
| tree | afc1aeab67b48481f50404246bcc048b6913e829 /t/t3408-rebase-multi-line.sh | |
| parent | remote: warn about unhandled branch.<name>.rebase values (diff) | |
| download | tgif-aa4df107e72a7a8bd2f149ecb58edfe9dde8576b.tar.xz | |
tests: stop testing `git rebase --preserve-merges`
This backend has been deprecated in favor of `git rebase
--rebase-merges`.
In preparation for dropping it, let's remove all the regression tests
that would need it.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3408-rebase-multi-line.sh')
| -rwxr-xr-x | t/t3408-rebase-multi-line.sh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh index ab0960e6d9..cde3562e3a 100755 --- a/t/t3408-rebase-multi-line.sh +++ b/t/t3408-rebase-multi-line.sh @@ -55,14 +55,4 @@ test_expect_success rebase ' test_cmp expect actual ' -test_expect_success REBASE_P rebasep ' - - git checkout side-merge && - git rebase -p side && - git cat-file commit HEAD | sed -e "1,/^\$/d" >actual && - git cat-file commit side-merge-original | sed -e "1,/^\$/d" >expect && - test_cmp expect actual - -' - test_done |