From: Junio C Hamano <gitster@pobox.com>
To: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] t3435: remove redundant test case
Date: Mon, 10 Oct 2022 10:02:34 -0700 [thread overview]
Message-ID: <xmqqpmez4no5.fsf@gitster.g> (raw)
In-Reply-To: <pull.1379.git.1665395106351.gitgitgadget@gmail.com> (Phillip Wood via GitGitGadget's message of "Mon, 10 Oct 2022 09:45:06 +0000")
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> 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?
> 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
next prev parent reply other threads:[~2022-10-10 17:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-10 9:45 [PATCH] t3435: remove redundant test case Phillip Wood via GitGitGadget
2022-10-10 17:02 ` Junio C Hamano [this message]
2022-10-11 15:38 ` Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpmez4no5.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).