Re: [PATCH 3/3] contrib/subtree: rename .txt to .adoc

[Patrick Steinhardt <ps@pks.im>]

On Fri, Feb 28, 2025 at 08:50:25AM -0500, Todd Zullinger wrote:
> 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.

That would be great indeed and very much appreciated!

Patrick