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

[PATCH v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test

From
Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Date
Sep 12, 2023, 10:42 UTC
Message-ID
<20230912104237.271616-1-oswald.buddenhagen@gmx.de>
In-Reply-To
<45ee4ad1-f7a3-43d8-99ef-329efc9fcdba@gmail.com>

This test was introduced by commit 0c164ae7a ("rebase -i: add another reword test", 2021-08-20). I didn't quite get what it was meant to do, so here's an explanation from Phillip:

The purpose of the test is to ensure that
  (i) There are no uncommited changes when the editor runs. I.e., we
      commit without running the editor and then reword by amending
      that commit. This ensures that we have the same user experience
      whether or not the commit was fast-forwarded [1].
 (ii) That the todo list is re-read after the commit has been reworded.
      This is to allow the user to update the todo list while the rebase
      is paused for editing the commit message.
[1] https://lore.kernel.org/git/20190812175046.GM20404@szeder.dev/
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
---
v2:
- actually, it's kinda a new patch now
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Junio C Hamano <gitster@pobox.com>
---
 t/t3404-rebase-interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 96a56aafbe..bf94eb28b9 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -758,7 +758,7 @@ test_expect_success 'reword' '
 	git show HEAD~2 | grep "C changed"
 '
 
-test_expect_success 'no uncommited changes when rewording the todo list is reloaded' '
+test_expect_success 'no uncommitted changes when rewording and the todo list is reloaded' '
 	git checkout E &&
 	test_when_finished "git checkout @{-1}" &&
 	(
-- 
2.42.0.419.g70bf8a5751
Previous: Phillip WoodNext: Oswald Buddenhagen
Message 4 of 7 in “t3404-rebase-interactive.sh: fix name of a rewording test”
  1. t3404-rebase-interactive.sh: fix name of a rewording testOswald Buddenhagen, Sep 11, 2023
  2. Junio C HamanoSep 11, 2023
  3. Phillip WoodSep 12, 2023
  4. t3404-rebase-interactive.sh: fix typos in title of a rewording testOswald Buddenhagen, Sep 12, 2023
  5. Oswald BuddenhagenSep 12, 2023
  6. Phillip WoodSep 12, 2023
  7. Junio C HamanoSep 13, 2023

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.