Stefan HallerandClaude Opus 5.5 1b4fc02040 Keep fast-forwarding the other branches when one of them fails ...

If `f` is used on several branches that are checked out in other
worktrees, the first worktree in which the fast-forward fails stops the
whole operation. For example, an untracked file that the fast-forward
would overwrite leaves the branches after it untouched, even though
nothing is wrong with them.

Try all the branches, and report the errors of the failed ones
together. The checks that refuse to fast-forward any of the branches
still run before anything is moved.

The next commit uses forwardBranches for auto-forwarding branches in
other worktrees, where stopping at the first failure is worse. A
worktree that fails every time would prevent the ones after it from
ever being forwarded. For this, forwardBranches also takes the git
commands to use, since a background worker doesn't block switching
repos.

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

2026-09-27 11:05:47 +02:00

..

helpers

Keep fast-forwarding the other branches when one of them fails

2026-09-27 11:05:47 +02:00

attach.go

…

base_controller.go

…

basic_commits_controller.go

Avoid appending to an array literal

2026-08-16 16:35:11 +02:00

bisect_controller.go

…

branches_controller.go

Allow fast-forwarding a range of branches

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

command_log_controller.go

…

commit_description_controller.go

…

commit_message_controller.go

…

commits_files_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

common.go

…

confirmation_controller.go

…

context_lines_controller.go

…

custom_patch_options_menu_action.go

…

diff_paths_test.go

Collapse the paths of a moved directory into the directory itself

2026-08-17 09:32:30 +02:00

diff_paths.go

Collapse the paths of a moved directory into the directory itself

2026-08-17 09:32:30 +02:00

diffing_menu_action.go

…

edit_config_action.go

…

files_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

filter_controller.go

Filter a menu by typing into it

2026-08-31 20:41:22 +02:00

filtering_menu_action.go

…

git_flow_controller.go

…

global_controller.go

Move re-rendering the main view after a diff renderer change to a helper

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

jump_to_side_window_controller.go

…

list_controller_trait.go

…

list_controller.go

…

local_commits_controller_test.go

…

local_commits_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

main_view_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

menu_controller.go

Point the note about the menu's essential keys at what it means

2026-08-31 20:41:22 +02:00

menu_key.go

…

merge_conflicts_controller.go

…

options_menu_action.go

Filter the keybindings menu as you type

2026-08-31 20:41:22 +02:00

patch_building_controller.go

…

patch_explorer_controller_test.go

…

patch_explorer_controller.go

…

prompt_controller.go

…

quit_actions.go

…

reflog_commits_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

remote_branches_controller.go

…

remotes_controller_test.go

…

remotes_controller.go

…

rename_similarity_threshold_controller.go

…

screen_mode_actions.go

…

scroll_off_margin_test.go

…

scroll_off_margin.go

…

search_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

search_prompt_controller.go

Remove error return value from functions that always return nil

2026-08-31 20:41:22 +02:00

shell_command_action.go

…

side_window_controller.go

…

snake_controller.go

…

staging_controller.go

…

stash_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

status_controller.go

Rename RunPtyTask to RunDiffRendererTask

2026-09-25 11:31:59 +02:00

sub_commits_controller.go

…

submodules_controller.go

Extract a single helper for the paths a node's diff is limited to

2026-08-17 09:32:30 +02:00

suggestions_controller.go

Drop the highlight fixups the context stack now makes unnecessary

2026-09-03 21:19:04 +02:00

switch_to_diff_files_controller.go

…

switch_to_focused_main_view_controller.go

…

switch_to_sub_commits_controller.go

…

sync_controller.go

Offer to push the branches stacked below the current one

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

tags_controller.go

…

toggle_whitespace_action.go

Re-render the main view without re-focusing the panel beneath it

2026-09-03 21:19:04 +02:00

undo_controller.go

…

vertical_scroll_controller.go

…

view_selection_controller.go

…

workspace_reset_controller.go

…

worktrees_controller.go

…