fix(hooks): conflict-marker check false-positived on decorative banners [#769]

Same tightening as PFVCluster scripts/check-rules.sh (O&M repo-split round). https://projects.knownelement.com/issues/769#note-4152
2026-09-03 21:27:31 -05:00
parent 6d11690932
commit 5e54f16f01
1 changed files with 1 additions and 1 deletions
@@ -24,7 +24,7 @@ while IFS= read -r -d '' f; do
    esac
    [ -f "$REPO_ROOT/$f" ] || continue

-    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then
+    if grep -nE '^(<{7}( \S+)?|=======|>{7}( \S+)?)$' "$REPO_ROOT/$f" >/dev/null 2>    if grep -nE '^(<<<<<<<|=======|>>>>>>>)' "$REPO_ROOT/$f" >/dev/null 2>&1; then1; then
        echo "FAIL conflict markers staged in $f" >&2; FAIL=1
    fi
    case "$f" in