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

fix: bd sync now follows .beads/redirect for worktree path (bd-e2q9, bd-kvus)

Browse Source 
When .beads/redirect exists, bd sync was using GetRepoRoot(cwd) to find
the git worktree location. This failed because the worktree should be
in the same repo as the beads directory, not the current working directory.

Fix: Use getRepoRootFromPath(beadsDir) to derive the repo root from
the actual beads location after following the redirect.

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
beads/crew/fang
2025-12-31 13:32:17 -08:00
committed by Steve Yegge
parent b362b36824
commit 5e8a834b38
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/bd/sync.go
View File

@@ -380,7 +380,13 @@ Use --merge to merge the sync branch back to main branch.`,
if err := ensureStoreActive(); err == nil && store != nil {
syncBranchName, _ = syncbranch.Get(ctx, store)
if syncBranchName != "" && syncbranch.HasGitRemote(ctx) {
repoRoot, err = syncbranch.GetRepoRoot(ctx)
// GH#829/bd-e2q9/bd-kvus: Get repo root from beads location, not cwd.
// When .beads/redirect exists, jsonlPath points to the redirected location
// (e.g., mayor/rig/.beads/issues.jsonl), but cwd is in a different repo
// (e.g., crew/gus). The worktree for sync-branch must be in the same
// repo as the beads directory.
beadsDir := filepath.Dir(jsonlPath)
repoRoot, err = getRepoRootFromPath(ctx, beadsDir)
if err != nil {
fmt.Fprintf(os.Stderr, "Warning: sync.branch configured but failed to get repo root: %v\n", err)
fmt.Fprintf(os.Stderr, "Falling back to current branch commits\n")