From: Thomas Bachem via GitGitGadget Date: Fri, 23 Oct 2026 13:19:00 GMT Subject: [PATCH v2 0/2] Two hook configuration changes Message-ID: In-Reply-To: Two small changes to hook configuration. With the first, hook.pre-commit.enabled=false also stops the pre-commit hook in the hooks directory. With the second, hook.*.enabled and hook.*.parallel can be given without a value, which means true, as for any other boolean. Changes since v1: * The documentation of hook..enabled now says that it covers configured hooks and the hook in the hooks directory alike. The subject and message of patch 1 present this as a change in behavior rather than a fix (Adrian, Junio). * The test that hook..enabled=false leaves the hooks of other events alone now has a hookdir hook too. Thomas Bachem (2): hook: make hook..enabled cover the hookdir hook hook: accept .enabled and .parallel given without a value Documentation/config/hook.adoc | 3 +- builtin/hook.c | 6 ++-- hook.c | 17 ++++++---- hook.h | 8 ++++- t/t1800-hook.sh | 57 ++++++++++++++++++++++++++++++++-- 5 files changed, 78 insertions(+), 13 deletions(-) base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2272%2Fthomasbachem%2Fhook-event-enabled-hookdir-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2272/thomasbachem/hook-event-enabled-hookdir-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/2272 Range-diff vs v1: 1: 1a7d060fae ! 1: cfcbe80ba5 hook: honor hook..enabled for the hookdir hook @@ Metadata Author: Thomas Bachem ## Commit message ## - hook: honor hook..enabled for the hookdir hook + hook: make hook..enabled cover the hookdir hook - The documentation added by dcfb5af67e (hook: add hook..enabled - switch, 2026-04-10) says that with hook..enabled set to false - "no hooks fire for that event", but only hooks defined in the - configuration are skipped. With hook.pre-commit.enabled=false, - "git commit" still runs .git/hooks/pre-commit, and "git hook list" - shows that hook without the "event-disabled" mark. + hook..enabled, added by dcfb5af67e (hook: add + hook..enabled switch, 2026-04-10), skips only the hooks + defined in the configuration when set to false. With + hook.pre-commit.enabled=false, "git commit" still runs + .git/hooks/pre-commit, and "git hook list" shows that hook without + the "event-disabled" mark. - Move the event_disabled flag out of u.configured in struct hook, set - it for the hookdir hook too, and check it for both kinds of hooks. + That was the intent, but the documentation says "no hooks fire for + that event", which reads as covering the hookdir hook too. No other + setting turns off the hookdir hook of a single event either: + core.hooksPath=/dev/null turns off the hookdir hooks of all events. + Make the switch cover the hookdir hook as well, and say so in the + documentation. This changes behavior for anyone who set the switch + and relied on the hookdir hook still running. The test for hook..enabled=false looks only at the standard output, but "git hook run" sends hook output to the standard error, @@ Commit message Assisted-by: Claude Fable 5.1 Signed-off-by: Thomas Bachem + ## Documentation/config/hook.adoc ## +@@ Documentation/config/hook.adoc: hook..parallel:: + the effective job count is greater than 1. {see-git-hook} + + hook..enabled:: +- Switch to enable or disable all hooks for the `` hook event. ++ Switch to enable or disable all hooks for the `` hook event, ++ configured hooks and the traditional hook in the hooks directory alike. + When set to `false`, no hooks fire for that event, regardless of any + per-hook `hook..enabled` settings. Defaults to `true`. + {see-git-hook} + ## builtin/hook.c ## @@ builtin/hook.c: static int list(int argc, const char **argv, const char *prefix, @@ t/t1800-hook.sh: test_expect_success 'hook..jobs rejects values less than ' test_expect_success 'hook..enabled=true does not suppress hooks' ' +@@ t/t1800-hook.sh: test_expect_success 'hook..enabled=true does not suppress hooks' ' + test_expect_success 'hook..enabled=false does not affect other events' ' + test_config hook.hook-1.event test-hook && + test_config hook.hook-1.command "echo ran" && ++ test_hook test-hook <<-\EOF && ++ echo hookdir ran ++ EOF + test_config hook.other-event.enabled false && + git hook run --allow-unknown-hook-name test-hook >out 2>err && +- test_grep "ran" err ++ test_grep "^ran$" err && ++ test_grep "^hookdir ran$" err + ' + + test_expect_success 'hook..enabled=false still disables that hook' ' @@ t/t1800-hook.sh: test_expect_success 'git hook list shows event-disabled hooks as event-disabled' test_config hook.hook-1.command "echo ran" && test_config hook.hook-2.event test-hook && 2: 3db167c9d1 = 2: 53a5a1787a hook: accept .enabled and .parallel given without a value -- gitgitgadget