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

Re: [PATCH] t3404-rebase-interactive.sh: fix name of a rewording test

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 11, 2023, 22:36 UTC
Message-ID
<xmqqwmwws5gn.fsf@gitster.g>
In-Reply-To
<20230911122108.199207-1-oswald.buddenhagen@gmx.de>
Oswald Buddenhagen <oswald.buddenhagen@gmx.de> writes:
Show 12 quoted lines
> The given test name made no sense to me at all; it seems to be a
> concatenation of two unrelated things. This was introduced by
> commit 0c164ae7a ("rebase -i: add another reword test", 20-08-20).
>
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
>
> ---
> actually, i don't understand what the test even does. shouldn't it, to
> match the description, actually dirty the tree and verify that the
> operation fails?
>
> Cc: Phillip Wood <phillip.wood@dunelm.org.uk>

As a typofix the updated text looks more correct, but the above is a very good point, so I'll let Phillip, whose 0c164ae7 (rebase -i: add another reword test, 2021-08-20) introduced this test, react first.

Thanks for spotting and fixing.
Show 17 quoted lines
> ---
>  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..31ee5bc1f6 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' '
>  	git checkout E &&
>  	test_when_finished "git checkout @{-1}" &&
>  	(
Previous: Oswald BuddenhagenNext: Phillip Wood
Message 2 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.