Patrick Steinhardt wrote:
> On Thu, Feb 27, 2025 at 10:47:05PM -0500, Todd Zullinger wrote:
>> The .txt extensions were changed to .adoc in 1f010d6bdf (doc: use .adoc
>> extension for AsciiDoc files, 2025-01-20).
>>
>> Do the same for contrib/contacts.
>
> ef18273a2d9 (Merge branch 'ps/meson-contrib-bits' into next, 2025-02-27)
> wires up this thingy via Meson, so we'd also need the following change
> on top:
>
> diff --git a/contrib/contacts/meson.build b/contrib/contacts/meson.build
> index 6ec92f47c43..73d82dfe52b 100644
> --- a/contrib/contacts/meson.build
> +++ b/contrib/contacts/meson.build
> @@ -16,7 +16,7 @@ if get_option('docs').contains('man')
> '@INPUT@',
> ],
> depends: documentation_deps,
> - input: 'git-contacts.txt',
> + input: 'git-contacts.adoc',
> output: 'git-contacts.xml',
> )
>
> @@ -47,7 +47,7 @@ if get_option('docs').contains('html')
> '@INPUT@',
> ],
> depends: documentation_deps,
> - input: 'git-contacts.txt',
> + input: 'git-contacts.adoc',
> output: 'git-contacts.html',
> install: true,
> install_dir: get_option('datadir') / 'doc/git-doc',
Since this is only in next and the first patch of the series
targets a "breakage" in 2.49.0-rc0, should I split the
latter commits into a separate series based on next or is
ef18273a2d9 likely to be merged into master before 2.49.0?
Whatever makes things easier for Junio is the goal. :)
Thanks,
--
Todd
