Auto-forward main branches after fetching #4493

stefanhaller · 2025-04-18T13:03:48Z

PR Description

Add a new user config for auto-forwarding branches after fetching; by default this is set to "onlyMainBranches", but it can be set to "allBranches" to extend it to feature branches too, or to "none" to disable it.

This is used both when fetching manually by pressing f in the files panel, and for automatic background fetching.

Please check if the PR fulfills these requirements

Cheatsheets are up-to-date (run go generate ./...)
Code has been formatted (see here)
Tests have been added/updated (see here for the integration test guide)
Text is internationalised (see here)
If a new UserConfig entry was added, make sure it can be hot-reloaded (see here)
Docs have been updated if necessary
You've read through your own file changes for silly mistakes etc

codacy-production · 2025-04-18T13:05:44Z

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
Report missing for `e4362ee`¹	✅ 95.77%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (`e4362ee`)	Report Missing	Report Missing	Report Missing
Head commit (`7495854`)	55547	48182	86.74%

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#4493)	189	181	95.77%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings Change summary preferences

Codacy didn't receive coverage data for the commit, or there was an error processing the received data. Check your integration for errors and validate that your coverage setup is correct. ↩

jesseduffield

Looking good, one thing

jesseduffield · 2025-04-20T07:53:49Z

pkg/gui/controllers/helpers/branches_helper.go

+	branches := self.c.Model().Branches
+	updateCommands := ""
+	// The first branch is the currently checked out branch; skip it
+	for _, branch := range branches[1:] {


I don't have a use case for auto-forwarding all branches: if you also don't have a use case for it I would just not support it to keep the code simple.

The use case is that you collaborate on some branches with a coworker, they push some new commits, and you get them auto-forwarded so that you have those commits right available when you check out the branch again. Saves one pull after checkout. I find this useful and will probably turn it on myself. (The downside is that you don't see that new commits were pushed, so that you can inspect them using "View divergence from upstream").

jesseduffield

LGTM

fetchAux already calls Refresh (and with a more targeted scope too), no need to call it again here.

It's only called from this one place, and the call is a one-liner, so it makes more sense to inline the code there.

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.48.0` -> `v0.50.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>jesseduffield/lazygit (jesseduffield/lazygit)</summary> ### [`v0.50.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.50.0) [Compare Source](jesseduffield/lazygit@v0.49.0...v0.50.0)  #### What's Changed ##### Enhancements 🔥 - Continue/abort a conflicted cherry-pick or revert by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4441 - Show todo items for pending cherry-picks and reverts by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4442 - Use "git cherry-pick" for implementing copy/paste of commits by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4443 - Allow reverting a range of commits by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4444 - Section headers for rebase todos and actual commits by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4463 - Focus the main view by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4429 - Auto-forward main branches after fetching by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4493 - Add new command "Move commits to new branch" by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#3876 - Strip the '+' and '-' characters when copying parts of a diff to the clipboard by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4519 - Reduce memory consumption of graph (pipe sets) by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4498 ##### Fixes 🔧 - Fix truncation of branches when scrolling branches panel to the left by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4483 - Fix nvim-remote commands for fish shell by [@SavingFrame](https://github.com/SavingFrame) in jesseduffield/lazygit#4506 - Disallow creating custom patches when the diff context size is 0 by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4522 - Remove double space between rebase todo and author columns by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4520 ##### Maintenance ⚙️ - Allow closing issues via github actions by [@jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4515 ##### Docs 📖 - Add Debian installation instructions alongside Ubuntu by [@jmkim](https://github.com/jmkim) in jesseduffield/lazygit#4501 - fix wording of random tip by [@dawedawe](https://github.com/dawedawe) in jesseduffield/lazygit#4488 #### New Contributors - [@jmkim](https://github.com/jmkim) made their first contribution in jesseduffield/lazygit#4501 - [@SavingFrame](https://github.com/SavingFrame) made their first contribution in jesseduffield/lazygit#4506 - [@dawedawe](https://github.com/dawedawe) made their first contribution in jesseduffield/lazygit#4488 **Full Changelog**: jesseduffield/lazygit@v0.49.0...v0.50.0 ### [`v0.49.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.49.0) [Compare Source](jesseduffield/lazygit@v0.48.0...v0.49.0)  #### What's Changed ##### Enhancements 🔥 - Support fish when running shell command by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4350 - Add acme editor preset by [@rakoo](https://github.com/rakoo) in jesseduffield/lazygit#4360 - Support home and end as alternatives to '<' and '>' by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4396 - Drop the git config cache when getting focus by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4376 - Add a "Content of selected file" entry to the copy menu for commit files by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4341 - Add root node in file tree by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4346 - \[FEAT] Add Recursive Bulk Initialize and Update for Submodules by [@cesarandr](https://github.com/cesarandr) in jesseduffield/lazygit#4259 - Commit without pre-commit hooks action is independent on prefix by [@kschweiger](https://github.com/kschweiger) in jesseduffield/lazygit#4374 - Let users define custom icons and color for files on the config file by [@hasecilu](https://github.com/hasecilu) in jesseduffield/lazygit#4395 - Add "Absolute path" item to the file view's copy menu by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4410 - Allow range drop stashes by [@gaogao-qwq](https://github.com/gaogao-qwq) in jesseduffield/lazygit#4451 - More navigation keybindings for confirmation panel by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4404 - Resolve non-inline merge conflicts by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4431 - Add `runCommand` function to Go template syntax + add support for templates in git `branchPrefix` setting by [@ruudk](https://github.com/ruudk) in jesseduffield/lazygit#4438 - Show "(hooks disabled)" in title bar of commit message editor by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4467 - Add a command to select all commits of the current branch by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4448 ##### Fixes 🔧 - Use a waiting status for rewording a non-head commit by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4343 - Fix layout of options view for non-english languages by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4359 - Fix changing language while lazygit is running by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4361 - URL encode gitlab brackets to make consistent with branch names by [@ChrisMcD1](https://github.com/ChrisMcD1) in jesseduffield/lazygit#4336 - Fix commitPrefix setting with empty pattern by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4381 - Commit only tracked files in tracked filter view by [@parthokunda](https://github.com/parthokunda) in jesseduffield/lazygit#4386 - Revert [#4313](jesseduffield/lazygit#4313) (Skip post-checkout hook when discarding changes) by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4407 - Enhance support for GPG signed tags by [@ChrisMcD1](https://github.com/ChrisMcD1) in jesseduffield/lazygit#4394 - Fix checking out a file from a range selection of commits by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4423 - Fix discarding submodule changes in nested folders by [@brandondong](https://github.com/brandondong) in jesseduffield/lazygit#4317 - Better support for shell aliases by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4385 - Fix hyperlinks in last line of confirmation popups by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4454 - Fix wrong main view content after pressing `e` in a stack of branches by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4450 - fix: update vscode color to logo color by [@PeterCardenas](https://github.com/PeterCardenas) in jesseduffield/lazygit#4459 - Fix crash with drag selecting and staging by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4480 - Escape special characters in filenames when git-ignoring files by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4475 ##### Maintenance ⚙️ - Fix linter warnings by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4352 - Fix release schedule again by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4364 - Update to go 1.24 by [@radsaq](https://github.com/radsaq) in jesseduffield/lazygit#4377 - Add an integration test for a config with a negative refspec by [@radsaq](https://github.com/radsaq) in jesseduffield/lazygit#4382 - Specify a go release minor version by [@radsaq](https://github.com/radsaq) in jesseduffield/lazygit#4393 - Fix flaky integration test by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4432 - Some code cleanup by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4449 - Bump the minimum required git version to 2.22 by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4439 - Bump go-git, and get rid of github.com/imdario/mergo by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4460 - Skip date check when release worfklow is manually invoked by [@jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazygit#4484 ##### Docs 📖 - Include empty arrays and maps in config docs by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4413 - Filter out deprecated user config fields from generated Config.md by [@karimkhaleel](https://github.com/karimkhaleel) in jesseduffield/lazygit#4416 - Corrected interactive rebase keybind example in README.md by [@NewtonChutney](https://github.com/NewtonChutney) in jesseduffield/lazygit#4426 - Update kidpix link in README to active url by [@ChrisMcD1](https://github.com/ChrisMcD1) in jesseduffield/lazygit#4425 ##### I18n 🌎 - Update translation files from Crowdin by [@stefanhaller](https://github.com/stefanhaller) in jesseduffield/lazygit#4473 #### New Contributors - [@rakoo](https://github.com/rakoo) made their first contribution in jesseduffield/lazygit#4360 - [@radsaq](https://github.com/radsaq) made their first contribution in jesseduffield/lazygit#4377 - [@cesarandr](https://github.com/cesarandr) made their first contribution in jesseduffield/lazygit#4259 - [@kschweiger](https://github.com/kschweiger) made their first contribution in jesseduffield/lazygit#4374 - [@NewtonChutney](https://github.com/NewtonChutney) made their first contribution in jesseduffield/lazygit#4426 - [@gaogao-qwq](https://github.com/gaogao-qwq) made their first contribution in jesseduffield/lazygit#4451 - [@ruudk](https://github.com/ruudk) made their first contribution in jesseduffield/lazygit#4438 **Full Changelog**: jesseduffield/lazygit@v0.48.0...v0.49.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

…4833) ### PR Description This is similar to #2957, except that in that case it was about an explicit fast-forward command, and we solved it by doing the fast-forward in the other work-tree (so that it would fail if that worktree had modified files, for example). In this case it is about the relatively new auto-forward feature (added in v0.50, see #4493), and in this case we fix it by not even trying to auto-forward any branches that are checked out by other worktrees.

stefanhaller added the enhancement New feature or request label Apr 18, 2025

stefanhaller requested a review from jesseduffield April 18, 2025 13:05

jesseduffield requested changes Apr 20, 2025

View reviewed changes

stefanhaller mentioned this pull request Apr 20, 2025

When creating a new branch off of a main branch that is behind its upstream, use the upstream instead #4490

Closed

7 tasks

stefanhaller force-pushed the auto-forward-branches-after-fetching branch from dc34b12 to 27374f3 Compare April 20, 2025 14:27

jesseduffield approved these changes Apr 21, 2025

View reviewed changes

stefanhaller enabled auto-merge April 21, 2025 16:05

stefanhaller added 4 commits April 21, 2025 18:06

Remove double Refresh

3577808

fetchAux already calls Refresh (and with a more targeted scope too), no need to call it again here.

Inline fetchAux into call site

2174762

It's only called from this one place, and the call is a one-liner, so it makes more sense to inline the code there.

Add config for auto-forwarding branches after fetching

eaaa937

Add a breaking changes hint for the new auto-forward behavior

7495854

stefanhaller force-pushed the auto-forward-branches-after-fetching branch from 27374f3 to 7495854 Compare April 21, 2025 16:06

stefanhaller merged commit bd1e34b into master Apr 21, 2025
14 checks passed

stefanhaller deleted the auto-forward-branches-after-fetching branch April 21, 2025 16:08

BrewTestBot mentioned this pull request May 3, 2025

lazygit 0.50.0 Homebrew/homebrew-core#222294

Merged

stefanhaller mentioned this pull request Aug 18, 2025

Don't auto-forward branches that are checked out in another worktree #4833

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Auto-forward main branches after fetching #4493

Auto-forward main branches after fetching #4493

Uh oh!

stefanhaller commented Apr 18, 2025

Uh oh!

codacy-production bot commented Apr 18, 2025 •

edited

Loading

Uh oh!

jesseduffield left a comment

Uh oh!

jesseduffield Apr 20, 2025

Uh oh!

stefanhaller Apr 20, 2025

Uh oh!

jesseduffield left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Auto-forward main branches after fetching #4493

Auto-forward main branches after fetching #4493

Uh oh!

Conversation

stefanhaller commented Apr 18, 2025

Uh oh!

codacy-production bot commented Apr 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage summary from Codacy

See diff coverage on Codacy

See your quality gate settings Change summary preferences

Footnotes

Uh oh!

jesseduffield left a comment

Choose a reason for hiding this comment

Uh oh!

jesseduffield Apr 20, 2025

Choose a reason for hiding this comment

Uh oh!

stefanhaller Apr 20, 2025

Choose a reason for hiding this comment

Uh oh!

jesseduffield left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

codacy-production bot commented Apr 18, 2025 •

edited

Loading