101f094c91
Two fixes to prevent git pull --rebase from failing: 1. Skip hook execution during rebase operations by detecting .git/rebase-merge or .git/rebase-apply directories 2. Use --no-git-history flag to prevent git-history-backfill from writing to deletions.jsonl during imports The root cause was that post-checkout hooks were running during rebase, triggering the git-history-backfill which appends to deletions.jsonl. This created uncommitted changes that blocked the rebase from continuing. Bump hooks version to 0.26.0. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
57 lines
1.7 KiB
Bash
Executable File
57 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# bd-hooks-version: 0.26.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 --no-git-history' 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
|
|
|
|
# Skip during rebase - git may run post-merge during rebase operations
|
|
# and we must not modify working tree files or the rebase will fail
|
|
if [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; then
|
|
exit 0
|
|
fi
|
|
|
|
# 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 --no-git-history to import the updated JSONL
|
|
# --no-git-history prevents writes to deletions.jsonl during hook operations
|
|
# 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 --no-git-history 2>&1); then
|
|
echo "Warning: Failed to sync bd changes after merge" >&2
|
|
echo "$output" >&2
|
|
echo "" >&2
|
|
echo "Run 'bd doctor --fix' to diagnose and repair" >&2
|
|
# Don't fail the merge, just warn
|
|
fi
|
|
|
|
# Run quick health check (silent on success, hints if issues found)
|
|
# This catches version mismatches, outdated hooks, etc.
|
|
bd doctor --check-health 2>/dev/null || true
|
|
|
|
exit 0
|