mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
4f6cdedb1e
AutoForwardBranches relies on the worktree model to skip any branch that's currently checked out in another worktree (so we don't update its ref behind the worktree's back). The post-fetch refresh wasn't including the worktrees scope, so any external change to the worktree list between lazygit's startup and the fetch — a `git worktree add`, a `git checkout` in a linked worktree, a branch rename — left the in-memory model stale and the skip check returned false negatives. Add WORKTREES to the post-fetch refresh scope when auto-forwarding is enabled. We gate on the config so users with auto-forward disabled don't pay for an extra `git worktree list` plus per-worktree rev-parse on every fetch tick. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| fetch_and_auto_forward_branches_all_branches.go | ||
| fetch_and_auto_forward_branches_all_branches_checked_out_in_other_worktree.go | ||
| fetch_and_auto_forward_branches_none.go | ||
| fetch_and_auto_forward_branches_only_main_branches.go | ||
| fetch_and_auto_forward_branches_worktree_added_after_startup.go | ||
| fetch_prune.go | ||
| fetch_when_sorted_by_date.go | ||
| force_push.go | ||
| force_push_multiple_matching.go | ||
| force_push_multiple_upstream.go | ||
| force_push_remote_branch_not_stored_locally.go | ||
| force_push_triangular.go | ||
| pull.go | ||
| pull_and_set_upstream.go | ||
| pull_merge.go | ||
| pull_merge_conflict.go | ||
| pull_rebase.go | ||
| pull_rebase_conflict.go | ||
| pull_rebase_interactive_conflict.go | ||
| pull_rebase_interactive_conflict_drop.go | ||
| push.go | ||
| push_and_auto_set_upstream.go | ||
| push_and_set_upstream.go | ||
| push_follow_tags.go | ||
| push_no_follow_tags.go | ||
| push_tag.go | ||
| push_with_credential_prompt.go | ||
| rename_branch_and_pull.go | ||
| shared.go | ||