| Message ID | 20230912104237.271616-1-oswald.buddenhagen@gmx.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8aae4897567f4cd720f553b40b2f11c21cb5599e |
| Headers | show |
| Series | [v2] t3404-rebase-interactive.sh: fix typos in title of a rewording test | expand |
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.
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 <oswald.buddenhagen@gmx.de> This looks good to me, Thanks Phillip > --- > 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}" && > (
Phillip Wood <phillip.wood123@gmail.com> 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 <oswald.buddenhagen@gmx.de> > > This looks good to me, Thanks > > Phillip Thanks, both. Will queue.
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}" && (
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(-)