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

..

app

Handle daemon mode before creating the app config

2026-09-13 07:39:02 +02:00

cheatsheet

Construct logger separately and pass it into NewCommon

2026-09-13 07:39:02 +02:00

commands

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

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

common

…

config

Let users turn off the bold text of the selected line

2026-09-27 08:16:06 +02:00

constants

…

env

…

fakes

…

gocui

Let users turn off the bold text of the selected line

2026-09-27 08:16:06 +02:00

gui

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

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

i18n

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

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

integration

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

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

jsonschema

Let a config struct appear at more than one path in the schema

2026-09-27 08:16:06 +02:00

logs

…

snake

…

tasks

Hold a task while a view is read to its end

2026-09-05 15:09:52 +02:00

theme

Let users turn off the bold text of the selected line

2026-09-27 08:16:06 +02:00

updates

…

utils

Ignore escape sequences when wrapping text for a view

2026-09-27 08:21:02 +02:00