aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2024-04-09 15:27:24 +0000
committerJunio C Hamano <gitster@pobox.com>2024-04-09 16:03:19 -0700
commitb4454d5a7bbe8499a56bd428c1e7a671f744c533 (patch)
tree8185b66e3a5386c7ca27048ecb4ab3ef165b969f
parent1ad81756b4d573f455d40b182ce2fa3d53318fd0 (diff)
downloadgit-b4454d5a7bbe8499a56bd428c1e7a671f744c533.tar.gz
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). Make sure the "apply" backend is tested by specifying it explicitly. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3428-rebase-signoff.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh
index 133e54114f..1bebd1ce74 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
'