public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Ben Knoble <ben.knoble@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: "D. Ben Knoble" <ben.knoble+github@gmail.com>,
	git@vger.kernel.org, Phillip Wood <phillip.wood@dunelm.org.uk>,
	Patrick Steinhardt <ps@pks.im>,
	Marc Branchaud <marcnarc@xiplink.com>,
	Evan Martin <evan.martin@gmail.com>,
	"brian m. carlson" <sandals@crustytoothpaste.net>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v6] build: regenerate config-list.h when Documentation changes
Date: Mon, 23 Feb 2026 16:41:48 -0500	[thread overview]
Message-ID: <8AB2DD1B-FAFA-4510-82FA-BBD76B442676@gmail.com> (raw)
In-Reply-To: <aZv54vN9DdGsvre/@szeder.dev>


> Le 23 févr. 2026 à 01:55, SZEDER Gábor <szeder.dev@gmail.com> a écrit :
> 
> On Sat, Feb 21, 2026 at 09:07:17AM -0500, D. Ben Knoble wrote:
>> The Meson-based build doesn't know when to rebuild config-list.h, so the
>> header is sometimes stale.
>> 
>> For example, an old build directory might have config-list.h from before
>> 4173df5187 (submodule: introduce extensions.submodulePathConfig,
>> 2026-01-12), which added submodule.<name>.gitdir to the list. Without
>> it, t9902-completion.sh fails. Regenerating the config-list.h artifact
>> from sources fixes the artifact and the test.
>> 
>> Since Meson does not have (or want) builtin support for globbing like
>> Make, teach generate-configlist.sh to also generate a list of
>> Documentation files its output depends on, and incorporate that into the
>> Meson build.
>> 
>> We assume that if a user adds a new file under
>> Documentation/config then they will also edit one of the existing files
>> to include that new file, and that will trigger a rebuild. Also mark the
>> generator script as a dependency.
>> 
>> While we're at it, teach the Makefile to use the same "the script knows
>> it's dependencies" logic.
>> 
>> For Meson, combining the following commands helps debug dependencies:
>> 
>>    ninja -C <builddir> -t deps config-list.h
>>    ninja -C <builddir> -t browse config-list.h
>> 
>> The former lists all the dependencies discovered from our output ".d"
>> file (the config documentation) and the latter shows the dependency on
>> the script itself, among other useful edges in the dependency graph.
>> 
>> Helped-by: Patrick Steinhardt <ps@pks.im>
>> Helped-by: Phillip Wood <phillip.wood@dunelm.org.uk>
>> Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>
>> ---
>> 
>> Notes (benknoble/commits):
>>    Changes from v5 (<611a94cd988e3795bc63dba2f1b270aa0d058bd2.1771425395.git.ben.knoble+github@gmail.com>):
>> 
>>    • Reword a confusing sentence in the commit message
>> 
>> Makefile               |  5 +++--
>> generate-configlist.sh | 11 ++++++++++-
>> meson.build            |  5 ++++-
>> 3 files changed, 17 insertions(+), 4 deletions(-)
>> 
>> diff --git a/Makefile b/Makefile
>> index 7f37ad8f58..6f926ffb1f 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -2688,9 +2688,10 @@ $(BUILT_INS): git$X
>>    cp $< $@
>> 
>> config-list.h: generate-configlist.sh
>> +    @mkdir -p .depend
>> +    $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@ .depend/config-list.h.d
>> 
>> -config-list.h: Documentation/*config.adoc Documentation/config/*.adoc
>> -    $(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@
>> +-include .depend/config-list.h.d
> 
> This breaks the build when something disappears from
> Documentation/config/:
> 
>  $ git checkout origin/seen
>  HEAD is now at 57edfa3ce8 Merge branch 'ty/setup-error-tightening' into seen
>  $ ls -l Documentation/config/hook.adoc
>  -rw-rw-r-- 1 szeder szeder 3828 Feb 23 07:50 Documentation/config/hook.adoc
>  $ git grep hook.adoc
>  Documentation/git-hook.adoc:include::config/hook.adoc[]
>  Documentation/howto/meson.build:  'rebuild-from-update-hook.adoc',
>  Documentation/meson.build:  'git-hook.adoc' : 1,
>  $ make V=1 config-list.h
>  /bin/sh ./generate-configlist.sh . config-list.h .depend/config-list.h.d
>  $ git checkout 0aabf70f60
>  Previous HEAD position was 57edfa3ce8 Merge branch 'ty/setup-error-tightening' into seen
>  HEAD is now at 0aabf70f60 build: regenerate config-list.h when Documentation changes
>  $ ls -l Documentation/config/hook.adoc
>  ls: cannot access 'Documentation/config/hook.adoc': No such file or directory
>  $ git grep hook.adoc
>  Documentation/howto/meson.build:  'rebuild-from-update-hook.adoc',
>  Documentation/meson.build:  'git-hook.adoc' : 1,
>  $ make V=1 config-list.h
>  GIT_VERSION=2.53.0.119.g0aabf70f60
>  make: *** No rule to make target 'Documentation/config/hook.adoc', needed by 'config-list.h'.  Stop.
>  $ grep hook.adoc .depend/config-list.h.d
>  config-list.h: ./Documentation/config/hook.adoc

Indeed. This might arise while bisecting, which was my original motivation. Thoughts on a path forward? At least this issue (to me) is clearer than a spurious test failure :)

  reply	other threads:[~2026-02-23 21:42 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-07 21:59 [PATCH] meson: regenerate config-list.h when Documentation changes D. Ben Knoble
2026-02-07 22:38 ` Ben Knoble
2026-02-09 15:19 ` [PATCH v2] " D. Ben Knoble
2026-02-11 23:51   ` [PATCH v3] " D. Ben Knoble
2026-02-12  8:06     ` Patrick Steinhardt
2026-02-12 10:29     ` Phillip Wood
2026-02-12 14:14       ` Phillip Wood
2026-02-12 15:56     ` Ben Knoble
2026-02-16 22:28     ` [PATCH v4] " D. Ben Knoble
2026-02-17  0:33       ` Ben Knoble
2026-02-17  7:03         ` Patrick Steinhardt
2026-02-17 13:28           ` D. Ben Knoble
2026-02-17  7:02       ` Patrick Steinhardt
2026-02-17 13:28         ` D. Ben Knoble
2026-02-17 20:24           ` Junio C Hamano
2026-02-17  9:20       ` Phillip Wood
2026-02-17 13:38         ` D. Ben Knoble
2026-02-17 15:11           ` Phillip Wood
2026-02-18 14:37       ` [PATCH v5] build: " D. Ben Knoble
2026-02-19 10:19         ` Phillip Wood
2026-02-19 13:40           ` D. Ben Knoble
2026-02-19 13:56         ` Patrick Steinhardt
2026-02-21 13:58           ` D. Ben Knoble
2026-02-19 15:10         ` Marc Branchaud
2026-02-21 13:58           ` D. Ben Knoble
2026-02-21 14:07         ` [PATCH v6] " D. Ben Knoble
2026-02-23  6:37           ` Patrick Steinhardt
2026-02-23  6:55           ` SZEDER Gábor
2026-02-23 21:41             ` Ben Knoble [this message]
2026-02-24  9:58               ` Patrick Steinhardt
2026-02-24 11:00                 ` Phillip Wood
2026-02-24 14:12                   ` D. Ben Knoble
2026-02-24 14:39           ` [PATCH v7] " D. Ben Knoble
2026-02-25 18:45             ` Junio C Hamano
2026-02-26  3:20               ` Ben Knoble
2026-02-09 15:25 ` [PATCH] meson: " Patrick Steinhardt
2026-02-09 21:50   ` D. Ben Knoble
2026-02-11  7:42     ` Patrick Steinhardt
2026-02-11  9:44       ` Phillip Wood
2026-02-11 10:57         ` Phillip Wood
2026-02-11 11:00           ` Patrick Steinhardt
2026-02-11 10:58         ` Patrick Steinhardt
2026-02-11 14:05           ` Phillip Wood
2026-02-11 20:15             ` D. Ben Knoble
2026-02-11 19:58       ` D. Ben Knoble
2026-02-12  8:10         ` Patrick Steinhardt

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=8AB2DD1B-FAFA-4510-82FA-BBD76B442676@gmail.com \
    --to=ben.knoble@gmail.com \
    --cc=ben.knoble+github@gmail.com \
    --cc=evan.martin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=marcnarc@xiplink.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ps@pks.im \
    --cc=sandals@crustytoothpaste.net \
    --cc=szeder.dev@gmail.com \
    /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