jesseduffield.lazygit/pkg/integration/tests
Stefan Haller 9b88052a4e Add test demonstrating problem with revert (or cherry-pick) during a rebase
This problem can't happen inside of lazygit itself right now, but this will
change in the future. It will only happen when you stopped in an interactive
rebase on an "edit" entry, and then you perform a revert or cherry-pick
consisting of more than one commit; in this situation lazygit will show a
conflict although there is none.

This is not possible with lazygit yet, as we don't support range-select for
reverting, and we don't use `git cherry-pick` for cherry-picking. Both will
change in the future, so it's good to fix this bug.
2025-04-20 15:55:44 +02:00
..
bisect Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
branch Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
cherry_pick Mention which command is continued in PromptToContinueRebase 2025-04-20 15:53:17 +02:00
commit Show todos (and conflicting commit) for cherry-pick and revert 2025-04-20 15:55:44 +02:00
config Add an integration test for a config with a negative refspec 2025-03-11 08:33:41 +01:00
conflicts Mention which command is continued in PromptToContinueRebase 2025-04-20 15:53:17 +02:00
custom_commands Add runCommand function to Go template syntax 2025-04-09 10:44:36 +02:00
demo Add number of commits to cherry-pick confirmation prompt 2025-01-08 21:08:42 -08:00
diff Add "Absolute path" item to the file view's copy menu 2025-03-25 10:00:56 +01:00
file Mention which command is continued in PromptToContinueRebase 2025-04-20 15:53:17 +02:00
filter_and_search Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
filter_by_author Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
filter_by_path Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
interactive_rebase Add test demonstrating problem with revert (or cherry-pick) during a rebase 2025-04-20 15:55:44 +02:00
misc Cleanup: simplify and tighten test expectations related to clipboard 2025-02-19 18:50:12 +01:00
patch_building Mention which command is continued in PromptToContinueRebase 2025-04-20 15:53:17 +02:00
reflog Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
shared Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
shell_commands Rename "Custom Command" to "Shell Command" 2024-08-17 10:56:03 +02:00
staging Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
stash feat: Implement range stash drop 2025-04-02 17:34:35 +08:00
status Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
submodule Remove conditional code related to git earlier than 2.22 2025-04-09 10:40:52 +02:00
sync Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
tag Cleanup: simplify and tighten test expectations related to clipboard 2025-02-19 18:50:12 +01:00
ui Disable global keybinds while popups are active 2025-02-23 08:44:48 +01:00
undo Add a root item ("/") if files at top level have changed 2025-03-21 08:04:58 +01:00
worktree Fix typos 2025-01-03 10:50:36 +11:00
test_list.go Add test demonstrating problem with revert (or cherry-pick) during a rebase 2025-04-20 15:55:44 +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