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

fix(sync): avoid double export when uncommitted JSONL detected (bd-uuo9)

Browse Source 
Add alreadyExported flag to skip redundant export. When
gitHasUncommittedBeadsChanges() detects uncommitted changes, we export
at line 175. The flag prevents the normal flow from exporting again
at line 293.

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
amber
2026-01-04 16:21:20 -08:00
committed by Steve Yegge
parent 32aea46ca6
commit 659f52d6bd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/bd/sync.go
View File

@@ -166,6 +166,8 @@ Use --merge to merge the sync branch back to main branch.`,
// GH#885: Preflight check for uncommitted JSONL changes // GH#885: Preflight check for uncommitted JSONL changes
// This detects when a previous sync exported but failed before commit, // This detects when a previous sync exported but failed before commit,
// leaving the JSONL in an inconsistent state across worktrees. // leaving the JSONL in an inconsistent state across worktrees.
// Track if we already exported during pre-flight to avoid redundant export later.
alreadyExported := false
if hasUncommitted, err := gitHasUncommittedBeadsChanges(ctx); err != nil { if hasUncommitted, err := gitHasUncommittedBeadsChanges(ctx); err != nil {
fmt.Fprintf(os.Stderr, "Warning: failed to check for uncommitted changes: %v\n", err) fmt.Fprintf(os.Stderr, "Warning: failed to check for uncommitted changes: %v\n", err)
} else if hasUncommitted { } else if hasUncommitted {
@@ -176,6 +178,7 @@ Use --merge to merge the sync branch back to main branch.`,
FatalError("re-exporting to reconcile state: %v", err) FatalError("re-exporting to reconcile state: %v", err)
} }
fmt.Println("✓ State reconciled") fmt.Println("✓ State reconciled")
alreadyExported = true
} }
// GH#638: Check sync.branch BEFORE upstream check // GH#638: Check sync.branch BEFORE upstream check
@@ -287,7 +290,7 @@ Use --merge to merge the sync branch back to main branch.`,
} }
} }
if !skipExport { if !skipExport && !alreadyExported {
// Pre-export integrity checks // Pre-export integrity checks
if err := ensureStoreActive(); err == nil && store != nil { if err := ensureStoreActive(); err == nil && store != nil {
if err := validatePreExport(ctx, store, jsonlPath); err != nil { if err := validatePreExport(ctx, store, jsonlPath); err != nil {