From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Patrick Steinhardt <ps@pks.im>
Subject: [PATCH 0/3] Asciidoctor fixes for 2.48.0
Date: Sat, 21 Dec 2024 00:18:15 +0100 [thread overview]
Message-ID: <cover.1734734612.git.martin.agren@gmail.com> (raw)
The Asciidoctor build of the documentation regressed a bit with
a38edab7c8 (Makefile: generate doc versions via GIT-VERSION-GEN,
2024-12-06).
I think these issues and fixes are fairly orthogonal to the recent
discussions beginning at [1], with fixes being discussed beginning at
[2]. I've tested these here patches on top of that series' v1 [2]
rebased onto a38edab7c8, as well as on top of its recent v3 [3] as
applied on the indicated base-commit.
With these patches, I can use
make USE_ASCIIDOCTOR=YesPlease doc
and
./doc-diff --asciidoctor <...> <...>
with similar results as pre-a38edab7c8.
On top of current master [4], these patches help, but for "doc-diff",
the GIT_VERSION injection is still broken (as expected, that's why
[1,2,3] exist). These here patches don't refer to doc-diff or those
other patches [2,3] and could go in independently or on top.
These patches are based on [3] applied on its indicated base-commit.
[1] https://lore.kernel.org/git/20241218113324.GA594795@coredump.intra.peff.net/
[2] https://lore.kernel.org/git/20241219-b4-pks-git-version-via-environment-v1-0-9393af058240@pks.im/
[3] https://lore.kernel.org/git/20241220-b4-pks-git-version-via-environment-v3-0-1fd79b52a5fb@pks.im/
[4] v2.48.0-rc0-38-gff795a5c5e
Martin
Martin Ågren (3):
asciidoctor-extensions.rb.in: delete existing <refmiscinfo/>
asciidoctor-extensions.rb.in: add missing word
asciidoctor-extensions.rb.in: inject GIT_DATE
Documentation/asciidoctor-extensions.rb.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--
2.48.0.rc0.241.g3cddc25e2a
next reply other threads:[~2024-12-20 23:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-20 23:18 Martin Ågren [this message]
2024-12-20 23:18 ` [PATCH 1/3] asciidoctor-extensions.rb.in: delete existing <refmiscinfo/> Martin Ågren
2024-12-21 10:42 ` Patrick Steinhardt
2024-12-20 23:18 ` [PATCH 2/3] asciidoctor-extensions.rb.in: add missing word Martin Ågren
2024-12-20 23:18 ` [PATCH 3/3] asciidoctor-extensions.rb.in: inject GIT_DATE Martin Ågren
2024-12-21 2:42 ` [PATCH 0/3] Asciidoctor fixes for 2.48.0 Junio C Hamano
2024-12-21 10:43 ` Patrick Steinhardt
2024-12-21 16:58 ` 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=cover.1734734612.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
/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).