]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t3435: remove redundant test case
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 10 Oct 2022 09:45:06 +0000 (09:45 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Oct 2022 18:18:18 +0000 (11:18 -0700)
rebase --preserve-merges no longer exists so there is no point in
carrying this failing test case.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3435-rebase-gpg-sign.sh

index 5f8ba2c7399dc3d1cb5661097a3a3f0990624e77..6aa2aeb628d0eda991ee16760985f9017dceebb1 100755 (executable)
@@ -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 &&