johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(hooks): update comments and handle malformed YAML

Browse Source 
- Change comments from sync.branch to sync-branch for consistency
- Add head -1 to handle malformed YAML with duplicate keys

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-30 11:21:15 -08:00
parent ab58aa8224
commit 01052fffe8
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/git-hooks/pre-commit
View File

@@ -7,8 +7,8 @@
# .beads/beads.jsonl before the commit is created, preventing the
# race condition where daemon auto-flush fires after the commit.
#
# When sync.branch is configured, .beads changes are committed to a separate
# branch via worktree, so auto-staging is skipped for the main branch.
# When sync-branch is configured in config.yaml, .beads changes are committed
# to a separate branch via worktree, so auto-staging is skipped.
#
# Installation:
# cp examples/git-hooks/pre-commit .git/hooks/pre-commit
@@ -34,7 +34,8 @@ fi
SYNC_BRANCH="${BEADS_SYNC_BRANCH:-}"
if [ -z "$SYNC_BRANCH" ] && [ -f .beads/config.yaml ]; then
# Extract sync-branch value from YAML (handles quoted and unquoted values)
SYNC_BRANCH=$(grep -E '^sync-branch:' .beads/config.yaml 2>/dev/null | sed 's/^sync-branch:[[:space:]]*//' | sed 's/^["'"'"']//' | sed 's/["'"'"']$//')
# Use head -1 to only take first match if file is malformed
SYNC_BRANCH=$(grep -E '^sync-branch:' .beads/config.yaml 2>/dev/null | head -1 | sed 's/^sync-branch:[[:space:]]*//' | sed 's/^["'"'"']//' | sed 's/["'"'"']$//')
fi
if [ -n "$SYNC_BRANCH" ]; then
# sync-branch is configured, skip flush and auto-staging

7
examples/git-hooks/pre-push
View File

@@ -8,8 +8,8 @@
# 2. Checking for uncommitted changes (staged, unstaged, untracked, deleted)
# 3. Failing the push with clear instructions if changes found
#
# When sync.branch is configured, .beads changes are committed to a separate
# branch via worktree, so the uncommitted check is skipped for the main branch.
# When sync-branch is configured in config.yaml, .beads changes are committed
# to a separate branch via worktree, so the uncommitted check is skipped.
#
# The pre-commit hook already exports changes, but this catches:
# - Changes made between commit and push
@@ -33,7 +33,8 @@ fi
SYNC_BRANCH="${BEADS_SYNC_BRANCH:-}"
if [ -z "$SYNC_BRANCH" ] && [ -f .beads/config.yaml ]; then
# Extract sync-branch value from YAML (handles quoted and unquoted values)
SYNC_BRANCH=$(grep -E '^sync-branch:' .beads/config.yaml 2>/dev/null | sed 's/^sync-branch:[[:space:]]*//' | sed 's/^["'"'"']//' | sed 's/["'"'"']$//')
# Use head -1 to only take first match if file is malformed
SYNC_BRANCH=$(grep -E '^sync-branch:' .beads/config.yaml 2>/dev/null | head -1 | sed 's/^sync-branch:[[:space:]]*//' | sed 's/^["'"'"']//' | sed 's/["'"'"']$//')
fi
if [ -n "$SYNC_BRANCH" ]; then
# sync-branch is configured, skip .beads uncommitted check