git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] hook: honor hook.<event>.enabled for the hookdir hook

From
Adrian Ratiu <adrian.ratiu@collabora.com>
Date
Oct 22, 2026, 13:40 UTC
Message-ID
<874ied3las.fsf@collabora.com>
In-Reply-To
<xmqqbj8nosq1.fsf@gitster.g>
On Wed, 21 Oct 2026, Junio C Hamano <gitster@pobox.com> wrote:
Show 42 quoted lines
> Adrian Ratiu <adrian.ratiu@collabora.com> writes:
>> However, having said that, I don't have a strong opinion and am ok
>> either way, so if others think it's a good idea, we could accept this
>> patch instead of fixing the doc. :)
>
> I am undecided if we should treat it as a backward incompatible
> change or if we should just label this change as a "bugfix".
>
> The additional documentation in question said
>
>     hook.<event>.enabled::
>        Switch to enable or disable all hooks for the `<event>` hook event.
>        When set to `false`, no hooks fire for that event, regardless of any
>        per-hook `hook.<friendly-name>.enabled` settings. Defaults to `true`.
>        See linkgit:git-hook[1].
>
> which talks about "hook.<friendly-name>.enabled" setting, hinting
> that this is also about the hooks that can be controlled by that
> other setting, which was added by 1ecce722cd (hook: allow disabling
> config hooks, 2026-02-19), which added "diable" specifically for
> "config hooks", and the documentation from that addition says:
>
>     hook.<friendly-name>.enabled::
> 	Whether the hook `hook.<name>` is enabled. Defaults to `true`.
> 	Set to `false` to disable the hook without removing its
> 	configuration. This is particularly useful when a hook is defined
> 	in a system or global config file and needs to be disabled for a
> 	specific repository. See linkgit:git-hook[1].
>
> mentioning "removing its configuration", and "defined in ... config
> file", to me, it is very clear that this configuration variable is
> only about the hooks defined in the configuration system.
>
> Which tempts me to say that the change being discussed is a backward
> incompatible breakage, rather than a bugfix.
>
> But casual end-users would of course do not know how the feature
> evolved, and may not read the documentation of the feature they use
> carefully enough.  So I dunno.  Perhaps changing the behaviour at
> the same time updating the documentation to make it clear these
> cover all kinds of hooks, not just the configuration-defined ones,
> may be sufficient.
Agreed, let's keep it simple.

@Thomas, can you please send a v2 to update the documentation to make it clear that disabling the hook event disables both the config-defined hooks and the hookdir hooks for that event?

Just a short mention like you specified in hook.h, to avoid any ambiguity.

Many thanks, Adrian

Previous: Junio C HamanoNext: Thomas Bachem via GitGitGadget
Message 6 of 11 in “Fix two hook configuration bugs”
  1. 0/2 Fix two hook configuration bugsThomas Bachem via GitGitGadget, Oct 20, 2026
  2. 1/2 hook: honor hook.<event>.enabled for the hookdir hookThomas Bachem via GitGitGadget, Oct 20, 2026
  3. Junio C HamanoOct 20, 2026
  4. Adrian RatiuOct 20, 2026
  5. Junio C HamanoOct 21, 2026
  6. Adrian RatiuOct 22, 2026
  7. 2/2 hook: accept .enabled and .parallel given without a valueThomas Bachem via GitGitGadget, Oct 20, 2026
  8. 0/2 Two hook configuration changesThomas Bachem via GitGitGadget, Oct 23, 2026
  9. 1/2 hook: make hook.<event>.enabled cover the hookdir hookThomas Bachem via GitGitGadget, Oct 23, 2026
  10. 2/2 hook: accept .enabled and .parallel given without a valueThomas Bachem via GitGitGadget, Oct 23, 2026
  11. Junio C HamanoOct 23, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.