t3428: restore coverage for "apply" backend

phillipwood · gitster · commit b4454d5a7bbe · 2024-04-09T16:03:19.000-07:00
This test file assumes the "apply" backend is the default which is not the case since 2ac0d62 (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>
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ test_expect_success 'setup' '`
`38`	`38`
`39`	`39`	`# We configure an alias to do the rebase --signoff so that`
`40`	`40`	`# on the next subtest we can show that --no-signoff overrides the alias`
`41`		`-test_expect_success 'rebase --signoff adds a sign-off line' '`
`42`		`- git rbs HEAD^ &&`
	`41`	`+test_expect_success 'rebase --apply --signoff adds a sign-off line' '`
	`42`	`+ git rbs --apply HEAD^ &&`
`43`	`43`	`test_commit_message HEAD expected-signed`
`44`	`44`	`'`
`45`	`45`