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

Merge bd-xoyh-morsov: GH#517

Browse Source
This commit is contained in:
Steve Yegge
2025-12-16 01:17:18 -08:00
parent 60ae6586e7 0c9e78f42e
commit 2e9b5a5870
6 changed files with 1004 additions and 20157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/bd/sync.go
View File

@@ -392,12 +392,20 @@ 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)
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")
// GH#519: Check if sync.branch equals current branch
// If so, we can't use a worktree (git doesn't allow same branch in multiple worktrees)
// Fall back to direct commits on the current branch
if syncbranch.IsSyncBranchSameAsCurrent(ctx, syncBranchName) {
// sync.branch == current branch - use regular commits, not worktree
useSyncBranch = false
} else {
useSyncBranch = true
repoRoot, err = syncbranch.GetRepoRoot(ctx)
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")
} else {
useSyncBranch = true
}
}
}
}