{"thread":{"id":"53187","subject":"[PATCH] subtree: fix build with AsciiDoctor 2","startedAt":"2020-04-08T14:26:00Z","lastAt":"2020-04-08T19:09:57Z","messageCount":2,"participants":["Johannes Schindelin via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"395067","messageId":"pull.600.git.1586355949189.gitgitgadget@gmail.com","threadId":"53187","inReplyTo":null,"subject":"[PATCH] subtree: fix build with AsciiDoctor 2","fromName":"Johannes Schindelin via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-08T14:25:49Z","receivedAt":"2020-04-08T14:26:00Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"From: Johannes Schindelin <johannes.schindelin@gmx.de>\n\nThis is a (late) companion for f6461b82b93 (Documentation: fix build\nwith Asciidoctor 2, 2019-09-15).\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n    Adjust contrib/subtree to AsciiDoctor 2, too\n    \n    This is something I had to do because the Git for Windows release\n    process now offers only AsciiDoctor 2.\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/600\n\n contrib/subtree/Makefile | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\nindex 6906aae4414..6fa7496bfdb 100644\n--- a/contrib/subtree/Makefile\n+++ b/contrib/subtree/Makefile\n@@ -25,14 +25,16 @@ ASCIIDOC_HTML    = xhtml11\n ASCIIDOC_DOCBOOK = docbook\n ASCIIDOC_EXTRA   =\n XMLTO            = xmlto\n+XMLTO_EXTRA      =\n \n ifdef USE_ASCIIDOCTOR\n ASCIIDOC         = asciidoctor\n ASCIIDOC_CONF    =\n ASCIIDOC_HTML    = xhtml5\n-ASCIIDOC_DOCBOOK = docbook45\n+ASCIIDOC_DOCBOOK = docbook\n ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions\n ASCIIDOC_EXTRA  += -alitdd='&\\#x2d;&\\#x2d;'\n+XMLTO_EXTRA     += --skip-validation\n endif\n \n ifndef SHELL_PATH\n@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)\n \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n \n $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)\n-\t$(XMLTO) -m $(MANPAGE_XSL) man $^\n+\t$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^\n \n $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n \t$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \\\n\nbase-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775\n-- \ngitgitgadget\n"},{"id":"395085","messageId":"xmqqk12ppzeu.fsf@gitster.c.googlers.com","threadId":"53187","inReplyTo":"pull.600.git.1586355949189.gitgitgadget@gmail.com","subject":"Re: [PATCH] subtree: fix build with AsciiDoctor 2","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-04-08T19:09:45Z","receivedAt":"2020-04-08T19:09:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Johannes Schindelin via GitGitGadget\" <gitgitgadget@gmail.com>\nwrites:\n\n> From: Johannes Schindelin <johannes.schindelin@gmx.de>\n>\n> This is a (late) companion for f6461b82b93 (Documentation: fix build\n> with Asciidoctor 2, 2019-09-15).\n>\n> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n> ---\n>     Adjust contrib/subtree to AsciiDoctor 2, too\n>     \n>     This is something I had to do because the Git for Windows release\n>     process now offers only AsciiDoctor 2.\n\nThanks.  The original justifies its change quite well, and its\nreasoning applies perfectly well here, too.\n\n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-600%2Fdscho%2Fsubtree-and-docbook-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-600/dscho/subtree-and-docbook-v1\n> Pull-Request: https://github.com/gitgitgadget/git/pull/600\n>\n>  contrib/subtree/Makefile | 6 ++++--\n>  1 file changed, 4 insertions(+), 2 deletions(-)\n>\n> diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile\n> index 6906aae4414..6fa7496bfdb 100644\n> --- a/contrib/subtree/Makefile\n> +++ b/contrib/subtree/Makefile\n> @@ -25,14 +25,16 @@ ASCIIDOC_HTML    = xhtml11\n>  ASCIIDOC_DOCBOOK = docbook\n>  ASCIIDOC_EXTRA   =\n>  XMLTO            = xmlto\n> +XMLTO_EXTRA      =\n>  \n>  ifdef USE_ASCIIDOCTOR\n>  ASCIIDOC         = asciidoctor\n>  ASCIIDOC_CONF    =\n>  ASCIIDOC_HTML    = xhtml5\n> -ASCIIDOC_DOCBOOK = docbook45\n> +ASCIIDOC_DOCBOOK = docbook\n>  ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions\n>  ASCIIDOC_EXTRA  += -alitdd='&\\#x2d;&\\#x2d;'\n> +XMLTO_EXTRA     += --skip-validation\n>  endif\n>  \n>  ifndef SHELL_PATH\n> @@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)\n>  \t$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)\n>  \n>  $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)\n> -\t$(XMLTO) -m $(MANPAGE_XSL) man $^\n> +\t$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^\n>  \n>  $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)\n>  \t$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \\\n>\n> base-commit: 9fadedd637b312089337d73c3ed8447e9f0aa775\n"}]}