Re: [PATCH v2] asciidoctor: fix `synopsis` rendering

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 22, 2024, 20:45 UTC
Message-ID: <xmqqplr59mvm.fsf@gitster.g>
In-Reply-To: <pull.1749.v2.git.git.1721679949618.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 12 quoted lines

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Since 76880f0510c (doc: git-clone: apply new documentation formatting
> guidelines, 2024-03-29), the synopsis of `git clone`'s manual page is
> rendered differently than before; Its parent commit did the same for
> `git init`.
> ...
>  Documentation/.gitignore   | 1 +
>  Documentation/Makefile     | 1 +
>  Documentation/docinfo.html | 5 +++++
>  3 files changed, 7 insertions(+)
>  create mode 100644 Documentation/docinfo.html

I think our mails crossed. You need something like this squashed in, or "make distclean" would make the tree dirty as Ramsay reported.

 Documentation/Makefile                          | 5 +++++
 Documentation/{docinfo.html => docinfo-html.in} | 0
 2 files changed, 5 insertions(+)
 rename Documentation/{docinfo.html => docinfo-html.in} (100%)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 78e407e4bd..371d56eb5e 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -209,6 +209,8 @@ XMLTO_EXTRA += --skip-validation
 XMLTO_EXTRA += -x manpage.xsl
 endif
 
+ASCIIDOC_DEPS += docinfo.html
+
 SHELL_PATH ?= $(SHELL)
 # Shell quote;
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
@@ -337,6 +339,9 @@ clean:
 	$(RM) $(cmds_txt) $(mergetools_txt) *.made
 	$(RM) GIT-ASCIIDOCFLAGS
 
+docinfo.html: docinfo-html.in
+	$(QUIET_GEN)$(RM) $@ && cat $< >$@
+
 $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
 	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
 
diff --git a/Documentation/docinfo.html b/Documentation/docinfo-html.in
similarity index 100%
rename from Documentation/docinfo.html
rename to Documentation/docinfo-html.in

-- 
2.46.0-rc1-48-g0900f1888e