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>
123 lines
4.6 KiB
Bash
Executable File
123 lines
4.6 KiB
Bash
Executable File
#!/bin/sh
|
|
# bd-hooks-version: 0.22.2
|
|
#
|
|
# bd (beads) pre-push hook
|
|
#
|
|
# This hook prevents pushing stale JSONL by:
|
|
# 1. Flushing any pending in-memory changes to JSONL (if bd available)
|
|
# 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.
|
|
#
|
|
# The pre-commit hook already exports changes, but this catches:
|
|
# - Changes made between commit and push
|
|
# - Pending debounced flushes (5s daemon delay)
|
|
#
|
|
# Installation:
|
|
# cp examples/git-hooks/pre-push .git/hooks/pre-push
|
|
# chmod +x .git/hooks/pre-push
|
|
#
|
|
# Or use the install script:
|
|
# examples/git-hooks/install.sh
|
|
|
|
# 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, so skip the uncommitted check
|
|
if command -v bd >/dev/null 2>&1; then
|
|
# 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 .beads uncommitted check
|
|
# Changes are synced to the separate branch, not this one
|
|
exit 0
|
|
fi
|
|
fi
|
|
|
|
# Optionally flush pending bd changes so they surface in JSONL
|
|
# This prevents the race where a debounced flush lands after the check
|
|
if command -v bd >/dev/null 2>&1; then
|
|
bd sync --flush-only >/dev/null 2>&1 || true
|
|
fi
|
|
|
|
# Collect all tracked or existing JSONL files (beads.jsonl, issues.jsonl for backward compat, deletions.jsonl for deletion propagation)
|
|
FILES=""
|
|
for f in .beads/beads.jsonl .beads/issues.jsonl .beads/deletions.jsonl; do
|
|
# Include file if it exists in working tree OR is tracked by git (even if deleted)
|
|
if git ls-files --error-unmatch "$f" >/dev/null 2>&1 || [ -f "$f" ]; then
|
|
FILES="$FILES $f"
|
|
fi
|
|
done
|
|
|
|
# Check for any uncommitted changes using porcelain status
|
|
# This catches: staged, unstaged, untracked, deleted, renamed, and conflicts
|
|
if [ -n "$FILES" ]; then
|
|
# shellcheck disable=SC2086
|
|
if [ -n "$(git status --porcelain -- $FILES 2>/dev/null)" ]; then
|
|
echo "❌ Error: Uncommitted changes detected" >&2
|
|
echo "" >&2
|
|
echo "Before pushing, ensure all changes are committed. This includes:" >&2
|
|
echo " • bd JSONL updates (run 'bd sync')" >&2
|
|
echo " • any other modified files (run 'git status' to review)" >&2
|
|
echo "" >&2
|
|
|
|
# Check if bd is available and offer auto-sync
|
|
if command -v bd >/dev/null 2>&1; then
|
|
# Check if we're in an interactive terminal
|
|
if [ -t 0 ]; then
|
|
echo "Would you like to run 'bd sync' now to commit and push these changes? [y/N]" >&2
|
|
read -r response
|
|
case "$response" in
|
|
[yY][eE][sS]|[yY])
|
|
echo "" >&2
|
|
echo "Running: bd sync" >&2
|
|
if bd sync; then
|
|
echo "" >&2
|
|
echo "✓ Sync complete. Continuing with push..." >&2
|
|
exit 0
|
|
else
|
|
echo "" >&2
|
|
echo "❌ Sync failed. Push aborted." >&2
|
|
exit 1
|
|
fi
|
|
;;
|
|
*)
|
|
echo "" >&2
|
|
echo "Push aborted. Run 'bd sync' manually when ready:" >&2
|
|
echo "" >&2
|
|
echo " bd sync" >&2
|
|
echo " git push" >&2
|
|
echo "" >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
else
|
|
# Non-interactive: just show the message
|
|
echo "Run 'bd sync' to commit these changes:" >&2
|
|
echo "" >&2
|
|
echo " bd sync" >&2
|
|
echo "" >&2
|
|
exit 1
|
|
fi
|
|
else
|
|
# bd not available, fall back to manual git commands
|
|
echo "Please commit the updated JSONL before pushing:" >&2
|
|
echo "" >&2
|
|
# shellcheck disable=SC2086
|
|
echo " git add $FILES" >&2
|
|
echo ' git commit -m "Update bd JSONL"' >&2
|
|
echo " git push" >&2
|
|
echo "" >&2
|
|
exit 1
|
|
fi
|
|
fi
|
|
fi
|
|
|
|
exit 0
|