jesseduffield.lazygit/pkg
Stefan Haller b350876f84 Disallow any changes to commits or todos when cherry-picking or reverting
We treat the .git/sequencer/todo file as read-only. Technically it seems it
would be possible to treat it as modifiable in the same way as
.git/rebase-merge/git-rebase-todo, effectively turning a cherry-pick or revert
that stops at a conflict into an interactive rebase; however, git itself doesn't
allow this (there is no "git cherry-pick --edit-todo"), so it seems safer not to
rely on it.

Theoretically it would be possible to allow modifying the rebase todos when a
cherry-pick or revert conflicts in the middle of a rebase. However, it would
introduce a bit of complexity to support this, as we would have to be able to
distinguish between rebasing todos and cherry-picking/reverting todos, which we
currently can't; it could also be a bit error-prone as far as edge cases are
concerned. And it's really a pretty uncommon situation, so it doesn't seem worth
it, and we just forbid all modifications to todos whenever we are cherry-picking
or reverting.
2025-04-20 15:55:44 +02:00
..
app Bump minimum required git version to 2.22 2025-04-09 10:40:52 +02:00
cheatsheet Update to go 1.24 2025-03-08 14:53:54 -05:00
commands Fix the bug described in the previous commit 2025-04-20 15:55:44 +02:00
common Make common.UserConfig an atomic.Pointer for safe concurrent access 2024-08-18 10:24:52 +02:00
config Add a command to select all commits of the current branch 2025-04-10 09:02:09 +02:00
constants Make the links in the status panel point to the current version rather than master 2024-03-22 08:13:59 +01:00
env Support bare worktrees where worktree does not have its own .git file 2023-08-07 22:40:53 +10:00
fakes cleanup integration test code 2023-02-26 12:54:13 +11:00
gui Disallow any changes to commits or todos when cherry-picking or reverting 2025-04-20 15:55:44 +02:00
i18n Disallow any changes to commits or todos when cherry-picking or reverting 2025-04-20 15:55:44 +02:00
integration Disallow any changes to commits or todos when cherry-picking or reverting 2025-04-20 15:55:44 +02:00
jsonschema Remove deprecated configs from auto generated config.md 2025-03-23 12:44:24 +01:00
logs Remove secureexec package 2023-07-30 19:59:51 +10:00
snake integrate snake game into lazygit 2022-12-30 12:18:59 +11:00
tasks Suppress error logs when killing process on Windows 2025-02-15 14:51:35 +11:00
theme Highlight inactive selection in bold 2024-06-23 14:43:13 +02:00
updates Change direct access to Common.UserConfig to a getter 2024-08-18 10:24:52 +02:00
utils Migrate to only doing marshalling twice, and compare via deep copy 2025-02-27 17:05:31 -05:00