Files
beads/cmd/bd
Charles P. Cross e309b1c1aa fix(sync): respect sync.branch config when no upstream tracking (#640)
* fix(sync): respect sync.branch config when no upstream tracking

When sync.branch is explicitly configured, bd sync should use worktree-based
sync even if the current branch has no upstream tracking. This fixes the
issue where jj (Jujutsu) colocated repos and git worktrees without upstream
would incorrectly fall back to --from-main mode.

The fix checks for sync.branch configuration BEFORE the upstream check,
allowing the configured sync branch to take precedence.

Affected workflows:
- jj colocated repos (always use detached HEAD)
- Git worktrees not tracking a remote
- Temporary checkouts for testing

Fixes #638

* test(sync): add regression tests for sync.branch priority over upstream check

Add tests verifying that when sync.branch is configured, bd sync does NOT
fall back to --from-main mode even without upstream tracking. This covers:

- sync.branch configured without upstream (should use worktree sync)
- No sync.branch and no upstream (should fallback to from-main)
- Detached HEAD with sync.branch (jj workflow, should use worktree sync)

These tests ensure the fix for GH#638 doesn't regress.

---------

Co-authored-by: Charles P. Cross <cpdata@users.noreply.github.com>
2025-12-19 17:52:27 -08:00
..
2025-12-16 17:26:06 -08:00
2025-12-16 01:17:25 -08:00
2025-12-16 01:17:25 -08:00
2025-12-07 20:57:58 +11:00
2025-12-16 17:50:25 -08:00
2025-11-24 21:16:44 -08:00
2025-11-24 11:28:32 -08:00
2025-11-23 17:16:27 -08:00
2025-12-18 22:46:14 -08:00