cfe7d14ac4
When sync.branch is configured, .beads changes are committed to a separate branch via worktree rather than the current branch. Updated both hooks to detect this configuration and skip the uncommitted .beads check in that scenario. Changes: - pre-push: Skip uncommitted .beads check when sync.branch is set - pre-commit: Skip flush and auto-staging when sync.branch is set - Both: Use --json output for reliable config value detection - Bump version to 0.22.2 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
58 lines
2.0 KiB
Bash
Executable File
58 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
# bd-hooks-version: 0.22.2
|
|
#
|
|
# bd (beads) pre-commit hook
|
|
#
|
|
# This hook ensures that any pending bd issue changes are flushed to
|
|
# .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.
|
|
#
|
|
# Installation:
|
|
# cp examples/git-hooks/pre-commit .git/hooks/pre-commit
|
|
# chmod +x .git/hooks/pre-commit
|
|
#
|
|
# Or use the install script:
|
|
# examples/git-hooks/install.sh
|
|
|
|
# Check if bd is available
|
|
if ! command -v bd >/dev/null 2>&1; then
|
|
echo "Warning: bd command not found, skipping pre-commit flush" >&2
|
|
exit 0
|
|
fi
|
|
|
|
# Check if we're in a bd workspace
|
|
if [ ! -d .beads ]; then
|
|
# Not a bd workspace, nothing to do
|
|
exit 0
|
|
fi
|
|
|
|
# Check if sync.branch is configured - if so, .beads changes go to a separate
|
|
# branch via worktree, not the current branch
|
|
# Use --json to get clean output (human-readable format prints "(not set)")
|
|
SYNC_BRANCH=$(bd config get sync.branch --json 2>/dev/null | grep -o '"value": *"[^"]*"' | sed 's/"value": *"\([^"]*\)"/\1/')
|
|
if [ -n "$SYNC_BRANCH" ]; then
|
|
# sync.branch is configured, skip flush and auto-staging
|
|
# Changes are synced to the separate branch via 'bd sync'
|
|
exit 0
|
|
fi
|
|
|
|
# Flush pending changes to JSONL
|
|
# Use --flush-only to skip git operations (we're already in a git hook)
|
|
# Suppress output unless there's an error
|
|
if ! bd sync --flush-only >/dev/null 2>&1; then
|
|
echo "Error: Failed to flush bd changes to JSONL" >&2
|
|
echo "Run 'bd sync --flush-only' manually to diagnose" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Stage all tracked JSONL files (beads.jsonl, issues.jsonl for backward compat, deletions.jsonl for deletion propagation)
|
|
# git add is harmless if file doesn't exist
|
|
for f in .beads/beads.jsonl .beads/issues.jsonl .beads/deletions.jsonl; do
|
|
[ -f "$f" ] && git add "$f" 2>/dev/null || true
|
|
done
|
|
|
|
exit 0
|