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 3/3] t3428: restore coverage for "apply" backend
Date: Tue, 09 Apr 2024 16:08:47 -0700 [thread overview]
Message-ID: <xmqqzfu2yw00.fsf@gitster.g> (raw)
In-Reply-To: <b45af37e3c0a22cc9e0514eb681300be0b968e02.1712676444.git.gitgitgadget@gmail.com> (Phillip Wood via GitGitGadget's message of "Tue, 09 Apr 2024 15:27:24 +0000")
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> This test file assumes the "apply" backend is the default which is not
> the case since 2ac0d6273f (rebase: change the default backend from "am"
> to "merge", 2020-02-15). Make sure the "apply" backend is tested by
> specifying it explicitly.
Hmph, doesn't this lose coverage for the merge backend, though?
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> ---
> t/t3428-rebase-signoff.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh
> index 133e54114f6..1bebd1ce74a 100755
> --- a/t/t3428-rebase-signoff.sh
> +++ b/t/t3428-rebase-signoff.sh
> @@ -38,8 +38,8 @@ test_expect_success 'setup' '
>
> # We configure an alias to do the rebase --signoff so that
> # on the next subtest we can show that --no-signoff overrides the alias
> -test_expect_success 'rebase --signoff adds a sign-off line' '
> - git rbs HEAD^ &&
> +test_expect_success 'rebase --apply --signoff adds a sign-off line' '
> + git rbs --apply HEAD^ &&
> test_commit_message HEAD expected-signed
> '
next prev parent reply other threads:[~2024-04-09 23:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 15:27 [PATCH 0/3] Cleanup rebase signoff tests Phillip Wood via GitGitGadget
2024-04-09 15:27 ` [PATCH 1/3] t3428: modernize test setup Phillip Wood via GitGitGadget
2024-04-09 15:27 ` [PATCH 2/3] t3428: use test_commit_message Phillip Wood via GitGitGadget
2024-04-09 23:07 ` Junio C Hamano
2024-04-09 15:27 ` [PATCH 3/3] t3428: restore coverage for "apply" backend Phillip Wood via GitGitGadget
2024-04-09 23:08 ` Junio C Hamano [this message]
2024-04-10 9:42 ` phillip.wood123
2024-04-10 14:22 ` Junio C Hamano
2024-04-10 15:23 ` phillip.wood123
2024-04-10 16:45 ` Junio C Hamano
2024-04-12 9:33 ` phillip.wood123
2024-04-12 13:53 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzfu2yw00.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).