johno/beads
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(hooks): display helpful message for git worktree with beads (#416)

Browse Source 
Adds worktree detection to post-checkout hooks. When entering a git
worktree, displays a warning explaining that daemon mode has limitations
with worktrees and recommends using BEADS_NO_DAEMON=1.

Detection uses `git rev-parse --git-dir` vs `--git-common-dir` comparison
to identify worktree checkouts.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: maphew <maphew@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-11-29 22:30:06 -08:00
parent 3ffd1c1030
commit 30b2315245
3 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
.beads-hooks/post-checkout
View File

@@ -29,6 +29,38 @@ if [ ! -d .beads ]; then
exit 0 exit 0
fi fi
# Detect git worktree: compare --git-dir and --git-common-dir
GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
GIT_COMMON_DIR=$(git rev-parse --git-common-dir 2>/dev/null)
if [ -n "$GIT_DIR" ] && [ -n "$GIT_COMMON_DIR" ]; then
GIT_DIR_ABS=$(cd "$GIT_DIR" 2>/dev/null && pwd || echo "$GIT_DIR")
GIT_COMMON_DIR_ABS=$(cd "$GIT_COMMON_DIR" 2>/dev/null && pwd || echo "$GIT_COMMON_DIR")
if [ "$GIT_DIR_ABS" != "$GIT_COMMON_DIR_ABS" ]; then
# We're in a git worktree
cat >&2 <<'EOF'
╔══════════════════════════════════════════════════════════════════════════╗
║ Welcome to beads in git worktree! ║
╠══════════════════════════════════════════════════════════════════════════╣
║ Note: Daemon mode is not recommended with git worktrees. ║
║ Worktrees share the same database, and the daemon may commit changes ║
║ to the wrong branch. ║
║ ║
║ RECOMMENDED: Disable daemon for this session: ║
║ export BEADS_NO_DAEMON=1 ║
║ ║
║ For more information: ║
║ - Run: bd doctor ║
║ - Read: docs/GIT_INTEGRATION.md (lines 10-53) ║
║ ║
║ Issue tracking: bd-dc9 ║
╚══════════════════════════════════════════════════════════════════════════╝
EOF
fi
fi
# Check if any JSONL file exists in .beads/ # Check if any JSONL file exists in .beads/
if ! ls .beads/*.jsonl >/dev/null 2>&1; then if ! ls .beads/*.jsonl >/dev/null 2>&1; then
exit 0 exit 0

32
cmd/bd/templates/hooks/post-checkout
View File

@@ -35,6 +35,38 @@ if [ ! -d .beads ]; then
exit 0 exit 0
fi fi
# Detect git worktree: compare --git-dir and --git-common-dir
GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
GIT_COMMON_DIR=$(git rev-parse --git-common-dir 2>/dev/null)
if [ -n "$GIT_DIR" ] && [ -n "$GIT_COMMON_DIR" ]; then
GIT_DIR_ABS=$(cd "$GIT_DIR" 2>/dev/null && pwd || echo "$GIT_DIR")
GIT_COMMON_DIR_ABS=$(cd "$GIT_COMMON_DIR" 2>/dev/null && pwd || echo "$GIT_COMMON_DIR")
if [ "$GIT_DIR_ABS" != "$GIT_COMMON_DIR_ABS" ]; then
# We're in a git worktree
cat >&2 <<'EOF'
╔══════════════════════════════════════════════════════════════════════════╗
║ Welcome to beads in git worktree! ║
╠══════════════════════════════════════════════════════════════════════════╣
║ Note: Daemon mode is not recommended with git worktrees. ║
║ Worktrees share the same database, and the daemon may commit changes ║
║ to the wrong branch. ║
║ ║
║ RECOMMENDED: Disable daemon for this session: ║
║ export BEADS_NO_DAEMON=1 ║
║ ║
║ For more information: ║
║ - Run: bd doctor ║
║ - Read: docs/GIT_INTEGRATION.md (lines 10-53) ║
║ ║
║ Issue tracking: bd-dc9 ║
╚══════════════════════════════════════════════════════════════════════════╝
EOF
fi
fi
# Check if any JSONL file exists in .beads/ # Check if any JSONL file exists in .beads/
if ! ls .beads/*.jsonl >/dev/null 2>&1; then if ! ls .beads/*.jsonl >/dev/null 2>&1; then
exit 0 exit 0

32
examples/git-hooks/post-checkout
View File

@@ -35,6 +35,38 @@ if [ ! -d .beads ]; then
exit 0 exit 0
fi fi
# Detect git worktree: compare --git-dir and --git-common-dir
GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
GIT_COMMON_DIR=$(git rev-parse --git-common-dir 2>/dev/null)
if [ -n "$GIT_DIR" ] && [ -n "$GIT_COMMON_DIR" ]; then
GIT_DIR_ABS=$(cd "$GIT_DIR" 2>/dev/null && pwd || echo "$GIT_DIR")
GIT_COMMON_DIR_ABS=$(cd "$GIT_COMMON_DIR" 2>/dev/null && pwd || echo "$GIT_COMMON_DIR")
if [ "$GIT_DIR_ABS" != "$GIT_COMMON_DIR_ABS" ]; then
# We're in a git worktree
cat >&2 <<'EOF'
╔══════════════════════════════════════════════════════════════════════════╗
║ Welcome to beads in git worktree! ║
╠══════════════════════════════════════════════════════════════════════════╣
║ Note: Daemon mode is not recommended with git worktrees. ║
║ Worktrees share the same database, and the daemon may commit changes ║
║ to the wrong branch. ║
║ ║
║ RECOMMENDED: Disable daemon for this session: ║
║ export BEADS_NO_DAEMON=1 ║
║ ║
║ For more information: ║
║ - Run: bd doctor ║
║ - Read: docs/GIT_INTEGRATION.md (lines 10-53) ║
║ ║
║ Issue tracking: bd-dc9 ║
╚══════════════════════════════════════════════════════════════════════════╝
EOF
fi
fi
# Check if any JSONL file exists in .beads/ # Check if any JSONL file exists in .beads/
if ! ls .beads/*.jsonl >/dev/null 2>&1; then if ! ls .beads/*.jsonl >/dev/null 2>&1; then
exit 0 exit 0