{"thread":{"id":"37691","subject":"git-log man2html conversion broken: http://git-scm.com/docs/git-log","startedAt":"2014-10-08T17:49:54Z","lastAt":"2014-10-09T02:58:25Z","messageCount":6,"participants":["Derek Moore","brian m. carlson","Junio C Hamano","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"250365","messageId":"CAMsgyKadiE-HOH_oLK=Fc0UQXnEuUTMHmz3=9zRiMvU0fr4KvA@mail.gmail.com","threadId":"37691","inReplyTo":null,"subject":"git-log man2html conversion broken: http://git-scm.com/docs/git-log","fromName":"Derek Moore","fromEmail":"derek.p.moore@gmail.com","sentAt":"2014-10-08T17:49:54Z","receivedAt":"2014-10-08T17:49:54Z","isPatch":false,"sender":{"key":"derek.p.moore@gmail.com","avatar":"https://gravatar.com/avatar/4bf86633cdd04eb5d07180791de5ae0ece9f3d04b34f6e13fdb81d563fc62c23?d=mp&s=160"},"body":"The HTML for the git-log man page is being misrendered on the official site.\n\nSee the placehoders list under \"format:\" in the PRETTY FORMATS section.\n"},{"id":"250395","messageId":"1412801170-60741-1-git-send-email-sandals@crustytoothpaste.net","threadId":"37691","inReplyTo":"CAMsgyKadiE-HOH_oLK=Fc0UQXnEuUTMHmz3=9zRiMvU0fr4KvA@mail.gmail.com","subject":"[PATCH] Documentation: fix misrender of pretty-formats in Asciidoctor","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2014-10-08T20:46:10Z","receivedAt":"2014-10-08T20:46:10Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"Neither the AsciiDoc nor the Asciidoctor documentation specify whether\nthe same number of delimiter characters must be used to end a block as\nto begin it, although both sets of documentation show exactly matching\npairs. AsciiDoc allows mismatches, but AsciiDoctor apparently does not.\nAdjust the pretty formats documentation to use matching pairs to prevent\na misrendering where the remainder of the document was rendered as a\nlisting block.\n\nSigned-off-by: brian m. carlson \n---\n Documentation/pretty-formats.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\nindex eecc39d..dcf7429 100644\n--- a/Documentation/pretty-formats.txt\n+++ b/Documentation/pretty-formats.txt\n@@ -95,7 +95,7 @@ would show something like this:\n The author of fe6e0ee was Junio C Hamano, 23 hours ago\n The title was >>t4119: test autocomputing -p for traditional diff input.<<\n \n---------\n+-------\n +\n The placeholders are:\n \n-- \n2.1.1\n"},{"id":"250396","messageId":"xmqqbnpm8eqx.fsf@gitster.dls.corp.google.com","threadId":"37691","inReplyTo":"1412801170-60741-1-git-send-email-sandals@crustytoothpaste.net","subject":"Re: [PATCH] Documentation: fix misrender of pretty-formats in Asciidoctor","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2014-10-08T20:53:42Z","receivedAt":"2014-10-08T20:53:42Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"brian m. carlson\" writes:\n\n> Neither the AsciiDoc nor the Asciidoctor documentation specify whether\n> the same number of delimiter characters must be used to end a block as\n> to begin it, although both sets of documentation show exactly matching\n> pairs. AsciiDoc allows mismatches, but AsciiDoctor apparently does not.\n> Adjust the pretty formats documentation to use matching pairs to prevent\n> a misrendering where the remainder of the document was rendered as a\n> listing block.\n>\n> Signed-off-by: brian m. carlson \n> ---\n\nThanks, well spotted, well described and well done ;-)\n\nWill queue.\n\n> Documentation/pretty-formats.txt | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\n> index eecc39d..dcf7429 100644\n> --- a/Documentation/pretty-formats.txt\n> +++ b/Documentation/pretty-formats.txt\n> @@ -95,7 +95,7 @@ would show something like this:\n> The author of fe6e0ee was Junio C Hamano, 23 hours ago\n> The title was >>t4119: test autocomputing -p for traditional diff input.<<\n> \n> ---------\n> +-------\n> +\n> The placeholders are:\n"},{"id":"250404","messageId":"20141009022956.GA18440@peff.net","threadId":"37691","inReplyTo":"CAMsgyKadiE-HOH_oLK=Fc0UQXnEuUTMHmz3=9zRiMvU0fr4KvA@mail.gmail.com","subject":"Re: git-log man2html conversion broken: http://git-scm.com/docs/git-log","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-10-09T02:29:56Z","receivedAt":"2014-10-09T02:29:56Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Oct 08, 2014 at 12:49:54PM -0500, Derek Moore wrote:\n\n> The HTML for the git-log man page is being misrendered on the official site.\n> \n> See the placehoders list under \"format:\" in the PRETTY FORMATS section.\n\nThanks for the report. This renders fine locally with asciidoc, but the\ngit-scm.com site uses the ruby asciidoctor gem. I think the issue is\nthat the start and end markers for the code block are not identical:\n\n-------\nThe author of fe6e0ee was Junio C Hamano, 23 hours ago\nThe title was >>t4119: test autocomputing -p for traditional diff\ninput.<<\n\n--------\n\nNote that we start with 7 hyphens, but end with 8.\n\nThe git-scm issue was already reported here (the site's issues are\ntracked separately from the mailing list):\n\n https://github.com/git/git-scm.com/issues/447\n\nbut I doubt if asciidoctor folks have been notified. I'll call their\nattention to that issue; they should produce the same output as regular\nasciidoc for this case.\n\nIn the meantime, I don't know if it is worth us applying this workaround\nto the documentation (I'd feel better if I had actually confirmed that\nit fixed the problem):\n\n-- >8 --\nSubject: docs: use identical start/end lines for code blocks\n\nSome AsciiDoc implementations (like the AsciiDoctor gem) do not\nrecognize the end of a code block if it does not match the start\nline exactly. Those implementations are wrong, but we can work around it\nand make our sources look nicer at the same time.\n\n---\ndiff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt\nindex eecc39d..d3e3d25 100644\n--- a/Documentation/pretty-formats.txt\n+++ b/Documentation/pretty-formats.txt\n@@ -91,7 +91,7 @@ instead of '\\n'.\n E.g, 'format:\"The author of %h was %an, %ar%nThe title was >>%s<<%n\"'\n would show something like this:\n +\n--------\n+--------\n The author of fe6e0ee was Junio C Hamano, 23 hours ago\n The title was >>t4119: test autocomputing -p for traditional diff input.<<\n \n"},{"id":"250405","messageId":"20141009023132.GB18440@peff.net","threadId":"37691","inReplyTo":"1412801170-60741-1-git-send-email-sandals@crustytoothpaste.net","subject":"Re: [PATCH] Documentation: fix misrender of pretty-formats in Asciidoctor","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2014-10-09T02:31:33Z","receivedAt":"2014-10-09T02:31:33Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Oct 08, 2014 at 08:46:10PM +0000, brian m. carlson wrote:\n\n> Neither the AsciiDoc nor the Asciidoctor documentation specify whether\n> the same number of delimiter characters must be used to end a block as\n> to begin it, although both sets of documentation show exactly matching\n> pairs. AsciiDoc allows mismatches, but AsciiDoctor apparently does not.\n> Adjust the pretty formats documentation to use matching pairs to prevent\n> a misrendering where the remainder of the document was rendered as a\n> listing block.\n\nArgh, I somehow missed your message and just typed an almost-identical\nresponse. Consider that an approval of your patch. :)\n\nI'm still going to report this to the AsciiDoctor folks; they should\nprobably be shooting for compatibility with vanilla AsciiDoc.\n\n-Peff\n"},{"id":"250407","messageId":"20141009025825.GA60571@vauxhall.crustytoothpaste.net","threadId":"37691","inReplyTo":"20141009023132.GB18440@peff.net","subject":"Re: [PATCH] Documentation: fix misrender of pretty-formats in Asciidoctor","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2014-10-09T02:58:25Z","receivedAt":"2014-10-09T02:58:25Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Wed, Oct 08, 2014 at 10:31:33PM -0400, Jeff King wrote:\n> I'm still going to report this to the AsciiDoctor folks; they should\n> probably be shooting for compatibility with vanilla AsciiDoc.\n\nPlease do. I contribute occasionally to Asciidoctor, so I may pick it\nup and fix it.\n\nI'm interested in getting git's documentation to work better with\nAsciidoctor out of the box, so you may see some patches along that line\nsometime soon.\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\n+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187\n"}]}