summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2021-09-07 21:05:04 +0000
committerJunio C Hamano <gitster@pobox.com>2021-09-07 21:45:32 -0700
commitaa4df107e72a7a8bd2f149ecb58edfe9dde8576b (patch)
treeafc1aeab67b48481f50404246bcc048b6913e829 /.github
parentab7c7c219b487ad8cde94c8c1155977cb2efd52b (diff)
downloadgit-aa4df107e72a7a8bd2f149ecb58edfe9dde8576b.tar.gz
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 '.github')
-rw-r--r--.github/workflows/main.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 47876a4f02..6115755c4d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -198,7 +198,6 @@ jobs:
shell: bash
env:
NO_SVN_TESTS: 1
- GIT_TEST_SKIP_REBASE_P: 1
run: ci/run-test-slice.sh ${{matrix.nr}} 10
- name: ci/print-test-failures.sh
if: failure()