| Message ID | 20250228034713.203461-3-tmz@pobox.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | doc: txt -> adoc fixes | expand |
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', Patrick
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 Zullinger <tmz@pobox.com> writes: > 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? ef18273a (Merge branch 'ps/meson-contrib-bits' into next, 2025-02-27) WILL NEVER be merged into master in any timeframe. Doing so will pull all the other merge commits on 'next' into 'master'. According to tinyurl.com/gitcal, we plan to tag -rc1 on Mar 4th and -rc2 on Mar 10th. The topic ps/meson-contrib-bits will have spent 7 calendar days in 'next' before we tag -rc2, so unless people find issues with the topic while in 'next', it is expected to land before the 10th. Creating a merge of ps/meson-contrib-bits topic into the 'master' (you do this yourself locally), and building your series on that merge commit (and you send these patches to the list, saying that they are based on such a merge in the cover letter) would be the most appropriate in this case, I think. Thanks.
Junio C Hamano wrote: > Todd Zullinger <tmz@pobox.com> writes: > >> 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? > > ef18273a (Merge branch 'ps/meson-contrib-bits' into next, > 2025-02-27) WILL NEVER be merged into master in any timeframe. > Doing so will pull all the other merge commits on 'next' into > 'master'. Thank you for patiently correcting and explaining that. I did intend it to be as you described, rather than merging the merge commit. But I was both lazy and sloppy with my wording, unfortunately. :/ > According to tinyurl.com/gitcal, we plan to tag -rc1 on Mar 4th and > -rc2 on Mar 10th. The topic ps/meson-contrib-bits will have spent 7 > calendar days in 'next' before we tag -rc2, so unless people find > issues with the topic while in 'next', it is expected to land before > the 10th. > > Creating a merge of ps/meson-contrib-bits topic into the 'master' > (you do this yourself locally), and building your series on that > merge commit (and you send these patches to the list, saying that > they are based on such a merge in the cover letter) would be the > most appropriate in this case, I think. Sounds good. I'll send a v2 with that shape momentarily.
diff --git a/contrib/contacts/Makefile b/contrib/contacts/Makefile index a2990f0dcb..9c4ca4f3bc 100644 --- a/contrib/contacts/Makefile +++ b/contrib/contacts/Makefile @@ -34,7 +34,7 @@ GIT_CONTACTS := git-contacts GIT_CONTACTS_DOC := git-contacts.1 GIT_CONTACTS_XML := git-contacts.xml -GIT_CONTACTS_TXT := git-contacts.txt +GIT_CONTACTS_TXT := git-contacts.adoc GIT_CONTACTS_HTML := git-contacts.html doc: $(GIT_CONTACTS_DOC) $(GIT_CONTACTS_HTML) diff --git a/contrib/contacts/git-contacts.txt b/contrib/contacts/git-contacts.adoc similarity index 100% rename from contrib/contacts/git-contacts.txt rename to contrib/contacts/git-contacts.adoc
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. Signed-off-by: Todd Zullinger <tmz@pobox.com> --- contrib/contacts/Makefile | 2 +- contrib/contacts/{git-contacts.txt => git-contacts.adoc} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename contrib/contacts/{git-contacts.txt => git-contacts.adoc} (100%)