From 7d796c7a111b2da3dc15d2b3569e143e183fd2d8 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Thu, 13 Apr 2023 16:38:14 +0100 Subject: [PATCH] t3428: restore coverage for "apply" backend 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). The way "merge" backend honors "--signoff" is already tested elsewhere, so make sure the "apply" backend is tested by specifying it explicitly. Signed-off-by: Phillip Wood --- 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 133e54114f66e8..1bebd1ce74a0ac 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 '