From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> rebase --preserve-merges no longer exists so there is no point in carrying this failing test case. Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> --- t3435: remove redundant test case test_expect_failure was covering up an unexpected failure. Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1379%2Fphillipwood%2Fwip%2Frebase-remove-redundant-test-case-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1379/phillipwood/wip/rebase-remove-redundant-test-case-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1379 t/t3435-rebase-gpg-sign.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh index 5f8ba2c7399..6aa2aeb628d 100755 --- a/t/t3435-rebase-gpg-sign.sh +++ b/t/t3435-rebase-gpg-sign.sh @@ -64,14 +64,6 @@ test_rebase_gpg_sign ! true -i --no-gpg-sign test_rebase_gpg_sign ! true -i --gpg-sign --no-gpg-sign test_rebase_gpg_sign false -i --no-gpg-sign --gpg-sign -test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' ' - test_when_finished "git clean -f" && - git reset --hard merged && - git config commit.gpgsign true && - git rebase -p --no-gpg-sign --onto=one fork-point main && - test_must_fail git verify-commit HEAD -' - test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' ' git reset --hard merged && test_unconfig commit.gpgsign && base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164 -- gitgitgadget