Files
lazygit/pkg
Stefan HallerandClaude Opus 5.5 7bf398db1d Add tests demonstrating bugs when moving a patch to an earlier commit
When moving a custom patch to an earlier commit, or into a new commit
before the original one, lazygit applies the patch to the earlier
commit and then replays the original commit unchanged. It relies on
git noticing during the replay that the patch's changes are already
there. This doesn't always work:

- If the patch contains only some of several adjacent added lines,
  replaying the original commit stops with a conflict.
- If git can place the patch's added lines in two positions because
  they repeat the line after them, the replay may put them in the
  other position than the patch did. Git then keeps both copies, and
  the file ends up containing the patch's lines twice. There's no
  conflict, so this goes unnoticed.

When moving into a new commit before the original one, the conflict of
the first case doesn't show the usual "Conflicts!" popup; lazygit
focuses the commits panel instead.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 19:25:48 +01:00
..
2025-05-06 09:43:26 +02:00
2026-07-31 08:42:51 +02:00
2025-11-15 10:46:23 +01:00