mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-11-21 04:46:29 +03:00
If git can't take the index lock to commit the changes of a pick during a rebase, it exits without writing rebase-merge/stopped-sha. Lazygit then showed the rebase as a cherry-pick, because it only recognized CHERRY_PICK_HEAD as part of a rebase if stopped-sha matched it. Also accept CHERRY_PICK_HEAD as part of the rebase if it matches the last todo in rebase-merge/done, the pick that git was executing. With this, continuing runs "git rebase --continue". In this state it refuses to commit the staged changes of the pick, because git didn't write the message file that it writes when a pick conflicts. So commit them first with "git cherry-pick --continue". This uses the author and message of the pick, like the rebase would have. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>