# [PATCH] t3404-rebase-interactive.sh: fix name of a rewording test 7 messages from 2023-09-11 to 2023-09-13. Participants: Oswald Buddenhagen, Junio C Hamano, Phillip Wood. Thread: https://gitlist.dev/t/60224 ## Oswald Buddenhagen, 2023-09-11 12:21 Subject: [PATCH] t3404-rebase-interactive.sh: fix name of a rewording test Message-ID: <20230911122108.199207-1-oswald.buddenhagen@gmx.de> URL: https://gitlist.dev/e/20230911122108.199207-1-oswald.buddenhagen%40gmx.de ``` 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 --- 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 --- 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}" && ( -- 2.42.0.419.g70bf8a5751 ``` ## Junio C Hamano, 2023-09-11 22:36 Subject: Re: [PATCH] t3404-rebase-interactive.sh: fix name of a rewording test Message-ID: URL: https://gitlist.dev/e/xmqqwmwws5gn.fsf%40gitster.g In-Reply-To: <20230911122108.199207-1-oswald.buddenhagen@gmx.de> ``` Oswald Buddenhagen writes: > 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 > > --- > 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 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. > --- > 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}" && > ( ``` ## Phillip Wood, 2023-09-12 10:15 Subject: Re: [PATCH] t3404-rebase-interactive.sh: fix name of a rewording test Message-ID: <45ee4ad1-f7a3-43d8-99ef-329efc9fcdba@gmail.com> URL: https://gitlist.dev/e/45ee4ad1-f7a3-43d8-99ef-329efc9fcdba%40gmail.com In-Reply-To: ``` On 11/09/2023 23:36, Junio C Hamano wrote: > Oswald Buddenhagen writes: > >> 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 >> >> --- >> 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 > > 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. There is a typo, but that typo is a missing "and", the title should be no uncommitted changes when rewording and the todo list is reloaded 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. All of the action happens in the functions called from this test. set_reword_editor() sets up an editor that runs "git diff --exit-code HEAD" to ensure there are no uncommitted changes when it is run and also updates the todo list. Then check_reworded_commits() checks that the commits were reworded and that the todo list was updated. Best Wishes Phillip [1] https://lore.kernel.org/git/20190812175046.GM20404@szeder.dev/ > Thanks for spotting and fixing. > >> --- >> 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}" && >> ( ``` ## Oswald Buddenhagen, 2023-09-12 10:42 Subject: [PATCH v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test Message-ID: <20230912104237.271616-1-oswald.buddenhagen@gmx.de> URL: https://gitlist.dev/e/20230912104237.271616-1-oswald.buddenhagen%40gmx.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 --- v2: - actually, it's kinda a new patch now Cc: Phillip Wood Cc: Junio C Hamano --- 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 ``` ## Oswald Buddenhagen, 2023-09-12 11:14 Subject: Re: [PATCH v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test Message-ID: URL: https://gitlist.dev/e/ZQBIBVadrMfsO9v9%40ugly In-Reply-To: <20230912104237.271616-1-oswald.buddenhagen@gmx.de> ``` On Tue, Sep 12, 2023 at 12:42:36PM +0200, Oswald Buddenhagen wrote: >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 ^ you may want to add the missing 't' here when applying.🙃 regards ``` ## Phillip Wood, 2023-09-12 13:26 Subject: Re: [PATCH v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test Message-ID: <76c36744-b821-450b-9817-e0cd8811de65@gmail.com> URL: https://gitlist.dev/e/76c36744-b821-450b-9817-e0cd8811de65%40gmail.com In-Reply-To: <20230912104237.271616-1-oswald.buddenhagen@gmx.de> ``` On 12/09/2023 11:42, Oswald Buddenhagen wrote: > 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 This looks good to me, Thanks Phillip > --- > v2: > - actually, it's kinda a new patch now > > Cc: Phillip Wood > Cc: Junio C Hamano > --- > 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}" && > ( ``` ## Junio C Hamano, 2023-09-13 00:25 Subject: Re: [PATCH v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test Message-ID: URL: https://gitlist.dev/e/xmqq8r9aly15.fsf%40gitster.g In-Reply-To: <76c36744-b821-450b-9817-e0cd8811de65@gmail.com> ``` Phillip Wood writes: > On 12/09/2023 11:42, Oswald Buddenhagen wrote: >> 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 > > This looks good to me, Thanks > > Phillip Thanks, both. Will queue. ```