From: Phillip Wood Date: Tue, 11 Oct 2022 15:38:55 GMT Subject: Re: [PATCH] t3435: remove redundant test case Message-ID: In-Reply-To: Hi Junio On 10/10/2022 18:02, Junio C Hamano wrote: > "Phillip Wood via GitGitGadget" writes: > >> From: Phillip Wood >> >> rebase --preserve-merges no longer exists so there is no point in >> carrying this failing test case. > > Looks good. > > I can imagine that you noticed that it was failing for a wrong > reason, perhaps as part of your test-todo topic? Yes I noticed it when I was looking for tests to convert to test-todo. Best Wishes Phillip >> 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