From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Jean-Noël Avila" <jn.avila@free.fr>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [PATCH v2] asciidoctor: fix `synopsis` rendering
Date: Mon, 22 Jul 2024 20:13:32 -0700 [thread overview]
Message-ID: <xmqqle1s4x7n.fsf@gitster.g> (raw)
In-Reply-To: <xmqqplr59mvm.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 22 Jul 2024 13:45:33 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> I think our mails crossed. You need something like this squashed
> in, or "make distclean" would make the tree dirty as Ramsay
> reported.
> ...
And I needed to undo the .gitignore change between v1 and v2 to
match (otherwise ci/lib.sh notices that docinfo.html is an
"unignored build artifact" and complains).
An updated SQUASH??? fixup looks like this.
Thanks.
Documentation/.gitignore | 1 -
Documentation/Makefile | 5 +++++
Documentation/{docinfo.html => docinfo-html.in} | 0
3 files changed, 5 insertions(+), 1 deletion(-)
rename Documentation/{docinfo.html => docinfo-html.in} (100%)
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index d11567fbbe..a48448de32 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -1,6 +1,5 @@
*.xml
*.html
-!/docinfo.html
*.[1-8]
*.made
*.texi
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-52-g816ffef0a1
next prev parent reply other threads:[~2024-07-23 3:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-20 20:30 [PATCH] asciidoctor: fix `synopsis` rendering Johannes Schindelin via GitGitGadget
2024-07-20 23:01 ` Junio C Hamano
2024-07-21 0:01 ` Junio C Hamano
2024-07-22 16:27 ` Junio C Hamano
2024-07-22 20:25 ` [PATCH v2] " Johannes Schindelin via GitGitGadget
2024-07-22 20:45 ` Junio C Hamano
2024-07-23 3:13 ` Junio C Hamano [this message]
2024-07-23 14:19 ` Johannes Schindelin
2024-07-23 16:43 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqle1s4x7n.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jn.avila@free.fr \
--cc=johannes.schindelin@gmx.de \
--cc=ramsay@ramsayjones.plus.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).