mirror of
https://github.com/getpaseo/paseo.git
synced 2026-10-24 02:02:42 +00:00
paseo-bot[bot]and2takumax-chura
bd78e5efa4
* fix: resolve real base branch for worktrees checked out from an existing branch When a worktree is created by checking out an already-existing branch, the stored baseRefName was set to the branch's own name instead of the repository's default branch. The diff panel then diffs the branch against itself, always showing no changes. Fixes #1873 * fix: fall back to the current branch when no default branch is found Addresses Greptile review feedback on #1874: resolveRepositoryDefaultBranch returns null for local-only repos with no origin/HEAD and no local main/master (e.g. a repo whose trunk is "develop"), which previously fell back to storing the checked-out branch as its own base — the exact self-diff bug this PR fixes. Fall back to whichever branch is currently checked out in the main repo instead. * fix(server): preserve existing-branch diffs through workspace restore Carry the resolved comparison base from the worktree creator into the workspace record. Resolve it for occupied branches too, so a fresh suffixed checkout still displays the feature's committed changes. Co-authored-by: 2takumax-chura <takuma.okayama@churadata.okinawa> * fix(server): skip deleted default refs when creating worktrees --------- Co-authored-by: 2takumax-chura <takuma.okayama@churadata.okinawa> Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>