aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/dot_config
diff options
context:
space:
mode:
authorLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2026-05-19 16:50:52 +0100
committerLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2026-05-19 16:50:52 +0100
commitae04627b43b4d533088b8a389e5462efed2ae8f6 (patch)
treef4083e02789c5803691defad7aa760abe40d9750 /dot_config
parent0fc39faa90f97db24043017a845f1754b4bb8b84 (diff)
downloaddotfiles-ae04627b43b4d533088b8a389e5462efed2ae8f6.tar.gz
dotfiles-ae04627b43b4d533088b8a389e5462efed2ae8f6.tar.bz2
dotfiles-ae04627b43b4d533088b8a389e5462efed2ae8f6.zip
refactor(git): use classic .git/hooks/ for per-clone override
Switch the dispatcher's per-clone override location from the bespoke .git/hooks-local/ to the classic .git/hooks/. This is: - The untracked location git has used since forever, so no new convention to learn. - Where husky, lefthook, pre-commit-the-tool, and most other hook managers install by default — they now "just work" again under our global core.hooksPath. git init's *.sample files don't collide because the dispatcher only matches the exact hook name and the executable bit. The only behavior change is that a forgotten legacy .git/hooks/pre-commit from before core.hooksPath was set will start running again — that's arguably restoring expected git semantics, not a regression.
Diffstat (limited to 'dot_config')
-rw-r--r--dot_config/git/hooks/_dispatch.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/dot_config/git/hooks/_dispatch.sh b/dot_config/git/hooks/_dispatch.sh
index 0b1135d..ed5acbf 100644
--- a/dot_config/git/hooks/_dispatch.sh
+++ b/dot_config/git/hooks/_dispatch.sh
@@ -4,13 +4,12 @@
# hook can do its own work after.
#
# Lookup order (first executable file wins):
-# 1. `<git-dir>/hooks-local/<hookname>` — untracked per-clone override,
-# lives inside .git/ so it stays personal. Use this when you want
-# to replace a tracked .githooks/<name> on a shared repo without
-# affecting teammates. Create with e.g.:
-# $ mkdir -p "$(git rev-parse --git-dir)/hooks-local"
-# $ $EDITOR "$(git rev-parse --git-dir)/hooks-local/pre-commit"
-# $ chmod +x "$(git rev-parse --git-dir)/hooks-local/pre-commit"
+# 1. `<git-dir>/hooks/<hookname>` — the classic, untracked per-clone
+# hook location. Already where tools like husky / lefthook /
+# pre-commit install. Drop a script here to override a tracked
+# .githooks/<name> on a shared repo without affecting teammates.
+# `git init`'s `*.sample` files don't match by name, so they're
+# ignored — no collision.
# 2. `<repo-top>/.githooks/<hookname>` — tracked, the project's
# shared hook. The intended default for opting a repo in.
#
@@ -19,8 +18,8 @@
# global logic afterwards.
#
# GIT_HOOK_DISPATCHED guards against re-entry: if some legacy repo has
-# its own `.githooks/<hook>` that ends with `exec "$HOME/.config/..."`
-# (the old stub pattern), we won't dispatch back into it a second time.
+# its own hook that ends with `exec "$HOME/.config/..."` (the old stub
+# pattern), we won't dispatch back into it a second time.
# shellcheck shell=sh
dispatch_repo_hook() {
@@ -32,7 +31,7 @@ dispatch_repo_hook() {
gitdir=$(git rev-parse --git-dir 2>/dev/null) || return 0
root=$(git rev-parse --show-toplevel 2>/dev/null) || return 0
- for candidate in "$gitdir/hooks-local/$hookname" "$root/.githooks/$hookname"; do
+ for candidate in "$gitdir/hooks/$hookname" "$root/.githooks/$hookname"; do
if [ -x "$candidate" ]; then
GIT_HOOK_DISPATCHED=1 "$candidate" "$@"
rc=$?