Stefan HallerandClaude Opus 5.5 ef00e18247 Refuse to fast-forward a branch being rebased or bisected in a worktree ...

The worktree loader associates a worktree that is mid-rebase or
mid-bisect with the branch involved, even though its HEAD is detached.
Fast-forwarding such a branch therefore ran the fast-forward in that
worktree. This moved the detached HEAD and put the upstream commits
into the rebase in progress, while the branch stayed where it was.

Remember in the worktree model when its branch comes from a rebase or
bisect, and refuse to fast-forward the branch in that case. Updating
only the ref is no option for a rebase; the rebase writes the branch
when it finishes.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

2026-09-27 11:00:36 +02:00

..

author.go

…

branch.go

Dim the divergence of a branch whose upstream was rewritten

2026-09-27 11:00:36 +02:00

commit_file.go

Show renamed files in the custom patch builder

2026-07-04 13:05:09 +02:00

commit_test.go

Add HeadCommitIdx helper function

2026-06-22 09:16:57 +02:00

commit.go

Add HeadCommitIdx helper function

2026-06-22 09:16:57 +02:00

file.go

Make the conflict marker size a parameter of our marker matching

2026-08-08 12:43:42 +02:00

github.go

Carry aggregate check state with GitHub pull requests

2026-07-31 09:01:44 +02:00

ref.go

Move the Ref interface from gui/types to models

2025-07-31 15:21:34 +02:00

remote_branch.go

…

remote.go

Add PushUrls field to models.Remote

2026-05-04 13:09:47 +02:00

stash_entry.go

Add hash field to models.StashEntry

2025-08-25 19:23:30 +02:00

submodule_config.go

…

tag.go

Revert "Add IsAnnotated field to models.Tag struct"

2025-07-28 10:53:51 +02:00

working_tree_state.go

Make WorkingTreeState a struct, and add cherry-picking and reverting states

2025-04-20 15:53:17 +02:00

worktree.go

Refuse to fast-forward a branch being rebased or bisected in a worktree

2026-09-27 11:00:36 +02:00