git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 3/3] t3428: restore coverage for "apply" backend

From
PGPhillip Wood via GitGitGadget <gitgitgadget@gmail.com>
Date
Apr 9, 2024, 15:27 UTC
Message-ID
<b45af37e3c0a22cc9e0514eb681300be0b968e02.1712676444.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1713.git.1712676444.gitgitgadget@gmail.com>
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.

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
 '
 
-- 
gitgitgadget
Previous: Junio C HamanoNext: Junio C Hamano
Message 5 of 12 in “Cleanup rebase signoff tests”
  1. 0/3 Cleanup rebase signoff testsPhillip Wood via GitGitGadget, Apr 9, 2024
  2. 1/3 t3428: modernize test setupPhillip Wood via GitGitGadget, Apr 9, 2024
  3. 2/3 t3428: use test_commit_messagePhillip Wood via GitGitGadget, Apr 9, 2024
  4. Junio C HamanoApr 9, 2024
  5. 3/3 t3428: restore coverage for "apply" backendPhillip Wood via GitGitGadget, Apr 9, 2024
  6. Junio C HamanoApr 9, 2024
  7. phillip.wood123@gmail.comApr 10, 2024
  8. Junio C HamanoApr 10, 2024
  9. phillip.wood123@gmail.comApr 10, 2024
  10. Junio C HamanoApr 10, 2024
  11. phillip.wood123@gmail.comApr 12, 2024
  12. Phillip WoodApr 12, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.