utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-14 17:46:26 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
jesseduffield.lazygit/pkg/integration/tests/interactive_rebase
History
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
..
advanced_interactive_rebase.go Remove target branch from title of rebase menu 2024-06-03 14:06:11 +02:00
amend_commit_with_conflict.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
amend_first_commit.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_fixup_commit.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_head_commit_during_rebase.go Improve prompts when amending commits 2023-09-01 18:55:16 +02:00
amend_merge.go Improve prompts when amending commits 2023-09-01 18:55:16 +02:00
amend_non_head_commit_during_rebase.go Use ErrorToast instead of error panel when invoking a disabled command 2024-01-14 17:45:35 +01:00
delete_update_ref_todo.go Fix deleting update-ref todos 2024-03-26 22:29:56 +01:00
dont_show_branch_heads_for_todo_items.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
drop_commit_in_copied_branch_with_update_ref.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
drop_merge_commit.go Remove conditional code related to git earlier than 2.22 2025-04-09 10:40:52 +02:00
drop_todo_commit_with_update_ref.go Fix the bug described in the previous commit 2025-04-08 16:14:31 +02:00
drop_with_custom_comment_char.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
edit_and_auto_amend.go Improve editing a commit 2024-12-01 11:05:45 +01:00
edit_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
edit_last_commit_of_stacked_branch.go Improve editing a commit 2024-12-01 11:05:45 +01:00
edit_non_todo_commit_during_rebase.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
edit_range_select_down_to_merge_outside_rebase.go Remove conditional code related to git earlier than 2.22 2025-04-09 10:40:52 +02:00
edit_range_select_outside_rebase.go Remove conditional code related to git earlier than 2.22 2025-04-09 10:40:52 +02:00
edit_the_confl_commit.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
fixup_first_commit.go Use ErrorToast instead of error panel when invoking a disabled command 2024-01-14 17:45:35 +01:00
fixup_second_commit.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
interactive_rebase_of_copied_branch.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
interactive_rebase_with_conflict_for_edit_command.go Add test to check that an "edit" entry correctly shows a conflict 2025-04-20 15:55:44 +02:00
mid_rebase_range_select.go Support setting a range of commits to "edit" outside of a rebase 2024-03-09 07:43:48 +01:00
move.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
move_across_branch_boundary_outside_rebase.go Fix moving a commit across a branch boundary in a stack 2024-12-23 12:18:48 +01:00
move_in_rebase.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
move_update_ref_todo.go Allow moving update-ref todos up/down 2024-03-16 22:01:03 +01:00
move_with_custom_comment_char.go Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
outside_rebase_range_select.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
pick_rescheduled.go Add test for a pick that fails and gets rescheduled 2023-06-22 18:57:43 +02:00
quick_start.go Allow showing Disabled errors as error panel instead of toast 2024-01-14 17:45:35 +01:00
quick_start_keep_selection.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
quick_start_keep_selection_range.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
rebase_with_commit_that_becomes_empty.go Add test for a special situation in rebases involving empty commits 2025-04-20 15:53:17 +02:00
revert_during_rebase_when_stopped_on_edit.go Add test demonstrating problem with revert (or cherry-pick) during a rebase 2025-04-20 15:55:44 +02:00
revert_multiple_commits_in_interactive_rebase.go Show todos (and conflicting commit) for cherry-pick and revert 2025-04-20 15:55:44 +02:00
revert_single_commit_in_interactive_rebase.go Show todos (and conflicting commit) for cherry-pick and revert 2025-04-20 15:55:44 +02:00
reword_commit_with_editor_and_fail.go Add test for rewording a commit and failing with an error 2023-06-22 18:57:43 +02:00
reword_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_last_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_you_are_here_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reword_you_are_here_commit_with_editor.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
shared.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
show_exec_todos.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00
squash_down_first_commit.go Use ErrorToast instead of error panel when invoking a disabled command 2024-01-14 17:45:35 +01:00
squash_down_second_commit.go Support range select in rebase actions 2024-01-23 17:23:56 +11:00
squash_fixups_above.go Make it easy to create "amend!" commits 2024-03-22 08:27:45 +01:00
squash_fixups_above_first_commit.go Make it easy to create "amend!" commits 2024-03-22 08:27:45 +01:00
squash_fixups_in_current_branch.go Keep the same line selected after squashing fixup commits 2024-03-09 07:55:22 +01:00
swap_in_rebase_with_conflict.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
swap_in_rebase_with_conflict_and_edit.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
swap_with_conflict.go Show original todo action instead of "conflict", and show <-- CONFLICT instead 2025-04-20 15:55:44 +02:00
view_files_of_todo_entries.go Use getters for AppState and UserConfig instead of accessing the fields directly 2024-08-18 10:24:52 +02:00