{"thread":{"id":"53882","subject":"[PATCH] gitworkflows.txt: fix broken subsection underline","startedAt":"2020-07-18T20:17:54Z","lastAt":"2020-08-10T14:18:48Z","messageCount":3,"participants":["Martin Ågren","Junio C Hamano","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"401743","messageId":"20200718201723.10889-1-martin.agren@gmail.com","threadId":"53882","inReplyTo":null,"subject":"[PATCH] gitworkflows.txt: fix broken subsection underline","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2020-07-18T20:17:23Z","receivedAt":"2020-07-18T20:17:54Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"AsciiDoctor renders the \"~~~~~~~~~\" literally. That's not our intention:\nit is supposed to indicate a level 2 subsection. In 828197de8f (\"docs:\nadjust for the recent rename of `pu` to `seen`\", 2020-06-25), the length\nof this section header grew by two characters but we didn't adjust the\nnumber of ~ characters accordingly. AsciiDoc handles this discrepancy ok\nand still picks this up as a subsection title, but Asciidoctor is not as\nforgiving.\n\nSigned-off-by: Martin Ågren <martin.agren@gmail.com>\n---\n Documentation/gitworkflows.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\nindex 2db7ba7842..47cf97f9be 100644\n--- a/Documentation/gitworkflows.txt\n+++ b/Documentation/gitworkflows.txt\n@@ -292,7 +292,7 @@ described in the previous section.\n \n \n Branch management for next and seen after a feature release\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n After a feature release, the integration branch 'next' may optionally be\n rewound and rebuilt from the tip of 'master' using the surviving\n-- \n2.28.0.rc1\n\n"},{"id":"401746","messageId":"xmqq1rl8blnw.fsf@gitster.c.googlers.com","threadId":"53882","inReplyTo":"20200718201723.10889-1-martin.agren@gmail.com","subject":"Re: [PATCH] gitworkflows.txt: fix broken subsection underline","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-07-18T20:41:55Z","receivedAt":"2020-07-18T20:42:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren <martin.agren@gmail.com> writes:\n\n> AsciiDoctor renders the \"~~~~~~~~~\" literally. That's not our intention:\n> it is supposed to indicate a level 2 subsection. In 828197de8f (\"docs:\n> adjust for the recent rename of `pu` to `seen`\", 2020-06-25), the length\n> of this section header grew by two characters but we didn't adjust the\n> number of ~ characters accordingly. AsciiDoc handles this discrepancy ok\n> and still picks this up as a subsection title, but Asciidoctor is not as\n> forgiving.\n>\n> Signed-off-by: Martin Ågren <martin.agren@gmail.com>\n> ---\n>  Documentation/gitworkflows.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n\nNicely spotted and this obviously want to be in the final release,\nas it comes from 828197de (docs: adjust for the recent rename of\n`pu` to `seen`, 2020-06-25), which is a post 2.27 development.\n\nThanks.\n\n>\n> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\n> index 2db7ba7842..47cf97f9be 100644\n> --- a/Documentation/gitworkflows.txt\n> +++ b/Documentation/gitworkflows.txt\n> @@ -292,7 +292,7 @@ described in the previous section.\n>  \n>  \n>  Branch management for next and seen after a feature release\n> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n>  \n>  After a feature release, the integration branch 'next' may optionally be\n>  rewound and rebuilt from the tip of 'master' using the surviving\n"},{"id":"403262","messageId":"nycvar.QRO.7.76.6.2008101618130.50@tvgsbejvaqbjf.bet","threadId":"53882","inReplyTo":"20200718201723.10889-1-martin.agren@gmail.com","subject":"Re: [PATCH] gitworkflows.txt: fix broken subsection underline","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2020-08-10T14:18:43Z","receivedAt":"2020-08-10T14:18:48Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Martin,\n\nOn Sat, 18 Jul 2020, Martin Ågren wrote:\n\n> AsciiDoctor renders the \"~~~~~~~~~\" literally. That's not our intention:\n> it is supposed to indicate a level 2 subsection. In 828197de8f (\"docs:\n> adjust for the recent rename of `pu` to `seen`\", 2020-06-25), the length\n> of this section header grew by two characters but we didn't adjust the\n> number of ~ characters accordingly. AsciiDoc handles this discrepancy ok\n> and still picks this up as a subsection title, but Asciidoctor is not as\n> forgiving.\n\nThanks for catching that _before_ the release. Much, much appreciated!\n\nCiao,\nDscho\n\n>\n> Signed-off-by: Martin Ågren <martin.agren@gmail.com>\n> ---\n>  Documentation/gitworkflows.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt\n> index 2db7ba7842..47cf97f9be 100644\n> --- a/Documentation/gitworkflows.txt\n> +++ b/Documentation/gitworkflows.txt\n> @@ -292,7 +292,7 @@ described in the previous section.\n>\n>\n>  Branch management for next and seen after a feature release\n> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n>\n>  After a feature release, the integration branch 'next' may optionally be\n>  rewound and rebuilt from the tip of 'master' using the surviving\n> --\n> 2.28.0.rc1\n>\n>\n"}]}