3d813c2143
- Fix computeJSONLHashForHook calling itself instead of computeJSONLHash - Update hook templates to call `bd hook` (Dolt-aware) instead of `bd hooks run` - Add documentation for Dolt-specific features (per-worktree state, branch-then-merge) The `bd hook` command (singular) provides: - Per-worktree export state tracking for shared Dolt databases - Branch-then-merge pattern for cell-level conflict resolution - Hook chaining configuration with timeout support - Guard against frequent post-checkout firing Fixes: hq-ew1mbr.9 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
25 lines
777 B
Bash
Executable File
25 lines
777 B
Bash
Executable File
#!/usr/bin/env sh
|
|
# bd-shim v1
|
|
# bd-hooks-version: 0.48.0
|
|
#
|
|
# bd (beads) post-merge hook - thin shim
|
|
#
|
|
# This shim delegates to 'bd hook post-merge' which contains
|
|
# the actual hook logic. This pattern ensures hook behavior is always
|
|
# in sync with the installed bd version - no manual updates needed.
|
|
#
|
|
# The 'bd hook' command (singular) supports:
|
|
# - Branch-then-merge pattern for Dolt (cell-level conflict resolution)
|
|
# - Per-worktree state tracking
|
|
# - Hook chaining configuration
|
|
|
|
# Check if bd is available
|
|
if ! command -v bd >/dev/null 2>&1; then
|
|
echo "Warning: bd command not found in PATH, skipping post-merge hook" >&2
|
|
echo " Install bd: brew install steveyegge/tap/bd" >&2
|
|
echo " Or add bd to your PATH" >&2
|
|
exit 0
|
|
fi
|
|
|
|
exec bd hook post-merge "$@"
|