jesseduffield.lazygit/pkg/integration/tests
Stefan Haller 9f38d02a4e Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts
When you rebase a branch and there are conflicts, lazygit asks you to continue
the rebase when it detects that all conflicts have been resolved. However, it is
common to make additional changes beyond just fixing the conflicts (e.g. to fix
build failures), and when doing that while the "Continue the rebase?" prompt is
showing, lazygit detects that too and asks you if you want to stage those newly
modified files too. This is all well and good (and can be disabled for those who
don't like it); however, lazygit would treat out-of-date submodules as unstaged
changes and would offer to stage those as well, and this is pretty bad and
almost never what you want. Fix this by excluding submodules from that second
check.
2026-03-30 17:41:53 +02:00
..
bisect Un-deprecate UserConfig.Git.Log.Order and ShowGraph 2025-07-09 13:15:03 +02:00
branch Don't stage out-of-date submodules when asking user to auto-stage after resolving conflicts 2026-03-30 17:41:53 +02:00
cherry_pick Add tests 2025-10-14 12:27:32 +02:00
commit Warn more prominently about resetting the patch when discarding changes 2026-03-07 20:47:19 +11:00
config Remove obsolete git version restrictions 2025-07-09 12:18:57 +02:00
conflicts Add merge options menu 2025-10-09 08:45:58 +02:00
custom_commands feat: support custom keybinds in custom command prompt menus 2025-12-22 13:43:52 +01:00
demo Enable hunk staging mode by default 2025-08-01 10:35:16 +02:00
diff Allow changing diff context size and rename threshold when main view is focused 2025-04-23 08:38:46 +02:00
file Improve performance of discarding changes in large directories 2026-03-27 14:34:47 +01:00
filter_and_search Filter file views rather than search 2026-03-07 20:04:31 +01:00
filter_by_author Un-deprecate UserConfig.Git.Log.Order and ShowGraph 2025-07-09 13:15:03 +02:00
filter_by_path When entering a commit in path filtering mode, select the filtered path 2025-10-09 09:58:15 +02:00
interactive_rebase Support using the selected commit's message in a fixup 2026-01-28 10:28:52 +01:00
misc Add "CopyToClipboard" command to ConfirmationController 2025-08-15 17:17:06 +02:00
patch_building Filter file views rather than search 2026-03-07 20:04:31 +01:00
reflog Un-deprecate UserConfig.Git.Log.Order and ShowGraph 2025-07-09 13:15:03 +02:00
remote feat: add fork remote command 2025-11-16 17:26:00 +01:00
shared Add merge options menu 2025-10-09 08:45:58 +02:00
shell_commands Rename "Custom Command" to "Shell Command" 2024-08-17 10:56:03 +02:00
staging Revert test workaround 2026-03-19 16:57:53 +01:00
stash Fix dropping a range of stashes in filtered mode 2025-08-25 18:41:06 +02:00
status Add backward cycling support for all branches log view 2026-03-08 17:06:17 +01:00
submodule Fix view selection running out of sync with list selection when view isn't focused 2025-04-20 16:06:15 +02:00
sync Show worktree name next to branch in branches list 2026-03-09 11:34:34 +01:00
tag Fix deleting a remote tag when a remote branch with the same name exists 2025-11-27 19:52:18 +01:00
ui Add no-ff merge option 2025-10-19 21:24:28 +02:00
undo Switch to branches view when checking out a commit 2025-11-16 21:23:40 +01:00
worktree Show worktree name next to branch in branches list 2026-03-09 11:34:34 +01:00
test_list.go Add test to demonstrate the problem 2026-03-30 17:34:18 +02:00
test_list_generator.go Fix typos 2025-01-03 10:50:36 +11:00
tests.go Set working directory in lazygit test command 2024-01-12 19:59:31 +11:00