From: Todd Zullinger <tmz@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org, "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH 3/3] contrib/subtree: rename .txt to .adoc
Date: Fri, 28 Feb 2025 08:50:25 -0500 [thread overview]
Message-ID: <Z8G_Ia-oXgRcgVvs@teonanacatl.net> (raw)
In-Reply-To: <Z8FwG_q7NmRDUqof@pks.im>
Patrick Steinhardt wrote:
> On Thu, Feb 27, 2025 at 10:47:06PM -0500, Todd Zullinger wrote:
>> The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc
>> extension for AsciiDoc files, 2025-01-20).
>
> Same here, we also need the following change on top:
>
> diff --git a/contrib/subtree/meson.build b/contrib/subtree/meson.build
> index a752a188df1..9c72b236259 100644
> --- a/contrib/subtree/meson.build
> +++ b/contrib/subtree/meson.build
> @@ -32,7 +32,7 @@ if get_option('docs').contains('man')
> '@INPUT@',
> ],
> depends: documentation_deps,
> - input: 'git-subtree.txt',
> + input: 'git-subtree.adoc',
> output: 'git-subtree.xml',
> )
>
> @@ -63,7 +63,7 @@ if get_option('docs').contains('html')
> '@INPUT@',
> ],
> depends: documentation_deps,
> - input: 'git-subtree.txt',
> + input: 'git-subtree.adoc',
> output: 'git-subtree.html',
> install: true,
> install_dir: get_option('datadir') / 'doc/git-doc',
Thanks. I have not yet looked at the meson build so I
didn't remember that should be checked. I still build a
full set of packages for rpm-based systems and there were a
few remaining items which were not covered by meson in
2.49.0-rc0 (or so I thought). :)
In particular, it was contrib/contacts and contrib/subtree;
although the latter is obviously not true and the former
won't be for long. I'll definitely have to take a stab at
building my local rpm's with meson very soon so I have some
better testing there.
--
Todd
next prev parent reply other threads:[~2025-02-28 13:50 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-28 3:47 [PATCH 0/3] doc: txt -> adoc fixes Todd Zullinger
2025-02-28 3:47 ` [PATCH 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-02-28 13:55 ` Junio C Hamano
2025-02-28 3:47 ` [PATCH 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-02-28 8:13 ` Patrick Steinhardt
2025-02-28 13:57 ` Todd Zullinger
2025-02-28 18:47 ` Junio C Hamano
2025-03-01 15:34 ` Todd Zullinger
2025-02-28 3:47 ` [PATCH 3/3] contrib/subtree: " Todd Zullinger
2025-02-28 8:13 ` Patrick Steinhardt
2025-02-28 13:50 ` Todd Zullinger [this message]
2025-02-28 14:09 ` Patrick Steinhardt
2025-02-28 18:34 ` Junio C Hamano
2025-02-28 13:45 ` [PATCH 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 15:36 ` [PATCH v2 " Todd Zullinger
2025-03-01 15:36 ` [PATCH v2 1/3] doc: update howto-index.sh for .adoc extensions Todd Zullinger
2025-03-01 15:36 ` [PATCH v2 2/3] contrib/contacts: rename .txt to .adoc Todd Zullinger
2025-03-01 15:36 ` [PATCH v2 3/3] contrib/subtree: " Todd Zullinger
2025-03-01 18:02 ` [PATCH v2 0/3] doc: txt -> adoc fixes Junio C Hamano
2025-03-01 18:20 ` Junio C Hamano
2025-03-01 18:25 ` [PATCH v2 4/3] doc: fix build-docdep.perl Junio C Hamano
2025-03-01 19:41 ` Todd Zullinger
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=Z8G_Ia-oXgRcgVvs@teonanacatl.net \
--to=tmz@pobox.com \
--cc=git@vger.kernel.org \
--cc=ps@pks.im \
--cc=sandals@crustytoothpaste.net \
/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