msiemens / PyGitUp / 31095981247

88%

push

github

feat: support rebasing branches checked out in worktrees (#145)

* feat: support rebasing branches checked out in worktrees

When a branch is checked out in a separate git worktree, `git checkout`
fails with 'already used by worktree'. Instead of checking out such
branches in the main repo, detect them via `git worktree list --porcelain`
and perform the rebase (or fast-forward merge) directly in the worktree
directory.

This handles:
- Fast-forward: runs `git merge --ff-only` in the worktree
- Rebase: stashes worktree changes if dirty, rebases, then unstashes

Fixes the error:
  fatal: '<branch>' is already used by worktree at '<path>'

Co-Authored-By: Oz <oz-agent@warp.dev>

* fix: skip worktree branches that are mid-rebase

When a linked worktree is in the middle of a rebase, git reports it as
'detached' in `git worktree list --porcelain` rather than pointing to
the branch ref. This caused `git checkout <branch>` to fail with exit
code 128 since git still considers the branch locked to that worktree.

Now detached worktrees are inspected for rebase state via
rebase-merge/head-name and rebase-apply/head-name, and any branch found
there is reported as 'rebase in progress' and skipped.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

* refactor: address reviewer feedback on worktree support

- Rename mid_rebase_branches -> in_progress_branches; skip worktrees
  mid-cherry-pick, -merge, and -bisect in addition to mid-rebase
- Extract _get_worktree_meta_dir() helper to eliminate duplicated .git
  pointer-file parsing
- Add _worktree_has_in_progress_op() to detect cherry-pick/merge/bisect
- Add suppress_pop to stasher() so the stash is not popped when a
  rebase fails with conflicts
- Simplify _rebase_in_worktree() to use GitWrapper.stasher() and
  GitWrapper.rebase() instead of duplicating that logic

---------

Co-authored-by: Oz <oz-agent@warp.dev>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Markus Siemens <mark... (continued)

55 of 82 new or added lines in 2 files covered. (67.07%)

441 of 505 relevant lines covered (87.33%)

13.1 hits per line