Stefan HallerandClaude Opus 5 667df9e784 Split fast-forwarding a branch into fetching and updating it ...

Fast-forwarding a branch that isn't checked out ran a single
`git fetch <remote> refs/heads/<branch>:<branch>`, so git's own refusal
to move a local branch backwards served as the safety check. A later
commit widens the set of branches the command accepts, and for that
lazygit has to make that decision itself.

Fetch the remote branch on its own, updating only its remote-tracking
branch. Then ask git whether the branch is an ancestor of it, and only
then move the branch: with `git update-ref` when it isn't checked out
anywhere, guarded by the hash we knew it to have, and with
`git merge --ff-only` in its worktree when it is checked out there.
Keeping `git pull --ff-only` for the latter case would fetch a second
time.

Fast-forwarding a branch that isn't checked out in a worktree had no
integration test at all, so add one. The second new test covers a repo
that keeps no reflogs, because a later commit starts reading those and
this case has to keep working without them.

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

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

..

context

Hand the whole reflog to GetReflogCommitListDisplayStrings

2026-09-19 10:16:04 +02:00

controllers

Split fast-forwarding a branch into fetching and updating it

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

filetree

Keep the topmost directory selected when a compressed directory splits

2026-09-20 16:04:57 +02:00

mergeconflicts

…

modes

…

patch_exploring

…

popup

…

presentation

Dim the divergence of a branch whose upstream was rewritten

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

services/custom_commands

…

status

…

style

Add a dim text style

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

types

Rename RunPtyTask to RunDiffRendererTask

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

background.go

…

command_log_panel.go

…

context_config.go

…

context.go

Derive the selection highlight from the context stack

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

controllers.go

Keep a filtering menu navigable whatever the keybindings are

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

dummies.go

…

editors.go

Filter a menu by typing into it

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

extras_panel.go

…

global_handlers.go

…

gui_common.go

Remove error return value from functions that always return nil

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

gui_driver.go

Add test helpers for a menu's filter row

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

gui.go

Pick the built-in theme defaults for the terminal's background

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

information_panel.go

…

keybindings.go

Remove error return value from functions that always return nil

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

layout_test.go

Lay out the filter row of a menu that filters as you type

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

layout.go

Filter a menu by typing into it

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

main_panels.go

Rename RunPtyTask to RunDiffRendererTask

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

main_view_render.go

Tell diff renderers whether the terminal is dark or light

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

menu_panel.go

Lay out the filter row of a menu that filters as you type

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

options_map.go

…

pty.go

Let a render refresh the index again on Windows

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

recent_repos_panel.go

…

side_panels_test.go

…

side_panels.go

…

tasks_adapter_test.go

…

tasks_adapter.go

Separate setting up a render from running it in a pty

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

test_mode.go

…

test_timeout_norace.go

…

test_timeout_race.go

…

view_helpers.go

Render the focused main view again while it is being searched

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

views.go

Let users turn off the bold text of the selected line

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