Fix lazygit getting unresponsive when pasting commits that become empty #4958
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Coverage summary from CodacySee diff coverage on Codacy
Coverage variation details
Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: Diff coverage details
Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: See your quality gate settings Change summary preferencesFootnotes
|
Whenever git returns the error "The previous cherry-pick is now empty", we would previously continue the rebase; this works for rebase because it behaves the same as "git rebase --skip" in this case. That's not true for cherry-pick though; if you continue a cherry-pick where the current commit is empty, it will return the same error again, causing lazygit to be stuck in an endless loop. Fix this by skipping instead of continuing; this shouldn't make a difference for rebase, but works for cherry-pick. Theoretically we could have a similar problem for revert (if you are trying to revert a commit that has already been undone through some other means); this should then be fixed in the same way with this change. However, the change is not relevant for revert because git returns a different error in this case.
I can't do my usual "add the tests first, with EXPECTED/ACTUAL sections that document the bug" method here, because the tests would hang without the bug being fixed. We need two different tests here: one where a cherry-picked commit simply becomes empty "by itself", because the change is already present on the destination branch (this was only a problem with git versions older than 2.45), and the other where the cherry-pick stops with conflicts, and the user resolves them such that no changes are left, and then continues the cherry-pick. This would still fail even with git 2.45 or later. The fix is the same for both cases though. The tests show that the selection behavior after skipping an empty cherry-picked commit is not ideal, but since that's only a minor cosmetic problem we don't bother fixing it here.
stefanhaller
force-pushed
the
fix-cherry-picking-empty-commits
branch
from
68b7338 to
3ac9003
Compare
7 tasks
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Nov 4, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [jesseduffield/lazygit](https://github.com/jesseduffield/lazygit) | minor | `v0.55.1` -> `v0.56.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.56.0`](https://github.com/jesseduffield/lazygit/releases/tag/v0.56.0) [Compare Source](jesseduffield/lazygit@v0.55.1...v0.56.0) <!-- Release notes generated using configuration in .github/release.yml at v0.56.0 --> #### What's Changed ##### Enhancements 🔥 - Don't break line after footnote symbol in commit messages by [@​stefanhaller](https://github.com/stefanhaller) in [#​4912](jesseduffield/lazygit#4912) - Give better visual feedback when checking out the previous branch by [@​stefanhaller](https://github.com/stefanhaller) in [#​4929](jesseduffield/lazygit#4929) - Add merge menu with conflict resolver by [@​lmnek](https://github.com/lmnek) in [#​4889](jesseduffield/lazygit#4889) - When entering a commit in path filtering mode, select the filtered path by [@​stefanhaller](https://github.com/stefanhaller) in [#​4942](jesseduffield/lazygit#4942) - Document a workaround for using custom pagers on Windows by [@​stefanhaller](https://github.com/stefanhaller) in [#​4941](jesseduffield/lazygit#4941) - Show "Log (x of y)" in the title bar when there is more than one branch log command by [@​stefanhaller](https://github.com/stefanhaller) in [#​4943](jesseduffield/lazygit#4943) - Support multiple pagers by [@​stefanhaller](https://github.com/stefanhaller) in [#​4953](jesseduffield/lazygit#4953) - Add config option gui.skipSwitchWorktreeOnCheckoutWarning by [@​stefanhaller](https://github.com/stefanhaller) in [#​4964](jesseduffield/lazygit#4964) - Add no-ff merge option by [@​stefanhaller](https://github.com/stefanhaller) in [#​4966](jesseduffield/lazygit#4966) ##### Fixes 🔧 - Don't log the git rev-list command that we use for IsBranchMerged by [@​stefanhaller](https://github.com/stefanhaller) in [#​4896](jesseduffield/lazygit#4896) - Hide the cursor when the password prompt is showing by [@​stefanhaller](https://github.com/stefanhaller) in [#​4878](jesseduffield/lazygit#4878) - Update Merge conflicts menu keybinding to use p instead of k by [@​zingazzi](https://github.com/zingazzi) in [#​4934](jesseduffield/lazygit#4934) - Update diff of conflicted file in the main view after conflicts have been resolved by [@​stefanhaller](https://github.com/stefanhaller) in [#​4945](jesseduffield/lazygit#4945) - Don't depend on en\_US locale to be installed by [@​stefanhaller](https://github.com/stefanhaller) in [#​4949](jesseduffield/lazygit#4949) - Fix dropping submodule changes from a commit by [@​stefanhaller](https://github.com/stefanhaller) in [#​4937](jesseduffield/lazygit#4937) - Fix support for Git copy status when status.renames=copies by [@​kapral18](https://github.com/kapral18) in [#​4892](jesseduffield/lazygit#4892) - When pasting multi-line text into a prompt, don't treat the line feeds as "confirm" by [@​stefanhaller](https://github.com/stefanhaller) in [#​4955](jesseduffield/lazygit#4955) - Offer to force-delete a worktree if it contains submodules by [@​stefanhaller](https://github.com/stefanhaller) in [#​4959](jesseduffield/lazygit#4959) - Fix window arrangement when a popup or the search prompt is open by [@​stefanhaller](https://github.com/stefanhaller) in [#​4961](jesseduffield/lazygit#4961) - Fix lazygit getting unresponsive when pasting commits that become empty by [@​stefanhaller](https://github.com/stefanhaller) in [#​4958](jesseduffield/lazygit#4958) - Show a better error message if the temp directory is not writeable by [@​stefanhaller](https://github.com/stefanhaller) in [#​4968](jesseduffield/lazygit#4968) - Avoid auto-stashing when only submodules are out of date by [@​stefanhaller](https://github.com/stefanhaller) in [#​4969](jesseduffield/lazygit#4969) - Use a PTY when using external diff command from git config by [@​brandondong](https://github.com/brandondong) in [#​4983](jesseduffield/lazygit#4983) - Fix fixup's false filename detection in hunks containing dashed lines by [@​abobov](https://github.com/abobov) in [#​5004](jesseduffield/lazygit#5004) ##### Maintenance ⚙️ - Make running with --debug and running integration tests work when built with go 1.25 by [@​stefanhaller](https://github.com/stefanhaller) in [#​4910](jesseduffield/lazygit#4910) - Update go to 1.25 by [@​kyu08](https://github.com/kyu08) in [#​4844](jesseduffield/lazygit#4844) - feat(nix): add comprehensive Nix flake by [@​doprz](https://github.com/doprz) in [#​4826](jesseduffield/lazygit#4826) - Fix normalisedSelectedNodes function by [@​stefanhaller](https://github.com/stefanhaller) in [#​4920](jesseduffield/lazygit#4920) - Add `synchronize` event to the hooks of "Check Required Labels" by [@​kyu08](https://github.com/kyu08) in [#​4974](jesseduffield/lazygit#4974) - Use ignore directive to ignore test files not to be passes to gofumpt by [@​kyu08](https://github.com/kyu08) in [#​4936](jesseduffield/lazygit#4936) ##### Docs 📖 - Fix MoveCommitsToNewBranch description typo by [@​deventon](https://github.com/deventon) in [#​4867](jesseduffield/lazygit#4867) - Wrap long lines in comments in Config.md by [@​stefanhaller](https://github.com/stefanhaller) in [#​4951](jesseduffield/lazygit#4951) - Fix keybinding cheatsheets with regard to pipe characters in key or description by [@​stefanhaller](https://github.com/stefanhaller) in [#​5007](jesseduffield/lazygit#5007) ##### I18n 🌎 - Update translations from Crowdin by [@​stefanhaller](https://github.com/stefanhaller) in [#​5005](jesseduffield/lazygit#5005) #### New Contributors - [@​deventon](https://github.com/deventon) made their first contribution in [#​4867](jesseduffield/lazygit#4867) - [@​zingazzi](https://github.com/zingazzi) made their first contribution in [#​4934](jesseduffield/lazygit#4934) - [@​doprz](https://github.com/doprz) made their first contribution in [#​4826](jesseduffield/lazygit#4826) - [@​lmnek](https://github.com/lmnek) made their first contribution in [#​4889](jesseduffield/lazygit#4889) - [@​kapral18](https://github.com/kapral18) made their first contribution in [#​4892](jesseduffield/lazygit#4892) - [@​abobov](https://github.com/abobov) made their first contribution in [#​5004](jesseduffield/lazygit#5004) **Full Changelog**: <jesseduffield/lazygit@v0.55.1...v0.56.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. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xNjkuMSIsInVwZGF0ZWRJblZlciI6IjQxLjE2OS4xIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Lazygit would become unresponsive when cherry-picking a commit that becomes empty at the destination. There are two ways this can happen: one where a cherry-picked commit simply becomes empty "by itself", because the change is already present on the destination branch (this was only a problem with git versions older than 2.45), and another where the cherry-pick stops with conflicts, and the user resolves them such that no changes are left, and then continues the cherry-pick. This would still fail even with git 2.45 or later. The fix is the same for both cases though.
Fixes #4763.