00840aa72f
Updated all component versions: - bd CLI: 0.23.1 → 0.24.0 - Plugin: 0.23.1 → 0.24.0 - MCP server: 0.23.1 → 0.24.0 - npm package: 0.23.1 → 0.24.0 - Documentation: 0.23.1 → 0.24.0 Added comprehensive CHANGELOG.md entry for 0.24.0 with 179 commits: - Critical bug fixes (auto-import resurrection, sync conflicts, resource leaks) - Performance improvements (GetReadyWork optimization, N+1 query elimination) - New features (bd doctor --fix, bd clean, auto-detection) - Enhanced AI agent support (context propagation, error handling) - Cross-platform improvements (Windows, macOS stability)
46 lines
1.2 KiB
Bash
Executable File
46 lines
1.2 KiB
Bash
Executable File
#!/bin/sh
|
|
# bd-hooks-version: 0.24.0
|
|
#
|
|
# bd (beads) post-merge hook
|
|
#
|
|
# This hook syncs the bd database after a git pull or merge:
|
|
# 1. Checks if any .beads/*.jsonl file was updated
|
|
# 2. Runs 'bd sync --import-only' to import changes
|
|
#
|
|
# Installation:
|
|
# cp examples/git-hooks/post-merge .git/hooks/post-merge
|
|
# chmod +x .git/hooks/post-merge
|
|
#
|
|
# 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 post-merge sync" >&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 any JSONL file exists in .beads/
|
|
if ! ls .beads/*.jsonl >/dev/null 2>&1; then
|
|
exit 0
|
|
fi
|
|
|
|
# Run bd sync --import-only to import the updated JSONL
|
|
# This is more robust than direct import as it handles all edge cases
|
|
# Capture both stdout and stderr to show user what went wrong
|
|
if ! output=$(bd sync --import-only 2>&1); then
|
|
echo "Warning: Failed to sync bd changes after merge" >&2
|
|
echo "$output" >&2
|
|
echo "" >&2
|
|
echo "Run 'bd sync --import-only' manually to resolve" >&2
|
|
# Don't fail the merge, just warn
|
|
fi
|
|
|
|
exit 0
|