chore(githooks): refresh versioned hooks
This commit is contained in:
1 parent
2ba3f59470
commit
5a7d01dee0
4 files changed
+87
-3
No files matched your search
+26
-3
@@ -7,17 +7,40 @@ br=$(git symbolic-ref --short -q HEAD 2>/dev/null)
|
||||
git rev-parse --verify -q HEAD >/dev/null 2>&1 || exit 0 # root commit — allow
|
||||
[ -f "$gd/MERGE_HEAD" ] && exit 0 # merge in progress — allow
|
||||
|
||||
# Secret backstop (job7) — any branch, not just protected ones. Non-blocking
|
||||
# if gitleaks isn't installed; auto-discovers ./.gitleaks.toml (repo root).
|
||||
# gitleaks >= 8.19 scans the index with `git --staged`; older builds (Ubuntu's
|
||||
# 8.16 package) only know `protect --staged`, and `git` exits 1 there as an
|
||||
# unknown command — which would block every commit. Probe the subcommand first.
|
||||
if command -v gitleaks >/dev/null 2>&1; then
|
||||
gl_sub=git
|
||||
gitleaks git --help >/dev/null 2>&1 || gl_sub=protect
|
||||
if ! gitleaks "$gl_sub" --staged --no-banner >/dev/null 2>&1; then
|
||||
echo "gitflow pre-commit: BLOCKED — gitleaks found a secret in staged changes." >&2
|
||||
echo " Details: gitleaks $gl_sub --staged --no-banner" >&2
|
||||
echo " Genuine false-positive? add an allowlist rule to .gitleaks.toml — never bypass with --no-verify." >&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "gitflow pre-commit: gitleaks not installed — secret scan skipped (https://github.com/gitleaks/gitleaks)." >&2
|
||||
fi
|
||||
|
||||
# Per-repo opt-out of the branch model (a clone of a foreign project):
|
||||
# git config gitflow.protect false
|
||||
[ "$(git config --bool --default true gitflow.protect)" = false ] && exit 0
|
||||
|
||||
case "$br" in
|
||||
main|develop) ;; # protected — keep checking
|
||||
*) exit 0 ;; # working branch — allow
|
||||
esac
|
||||
|
||||
# whitelist: all-staged-under-.claude/ (memory/doc/deploy helpers) — allow
|
||||
if [ -z "$(git diff --cached --name-only | grep -v '^\.claude/' | head -1)" ]; then
|
||||
# whitelist: all-staged-under-.claude/ (memory/doc/deploy helpers) or
|
||||
# .githooks/ (the hooks themselves, refreshed by the lib) — allow
|
||||
if [ -z "$(git diff --cached --name-only | grep -vE '^\.(claude|githooks)/' | head -1)" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "gitflow pre-commit: BLOCKED — direct commit on '$br'." >&2
|
||||
echo " Branch from the right base (feature/bugfix->develop, hotfix->main), or merge." >&2
|
||||
echo " (.claude/** memory commits are exempt; --no-verify bypasses locally.)" >&2
|
||||
echo " (.claude/** and .githooks/** commits are exempt; foreign clone? git config gitflow.protect false)" >&2
|
||||
exit 1
|
||||
Reference in new issue
Block a user