1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-06 10:47:38 +02:00
lazygit/pkg/integration/tests/interactive_rebase
Stefan Haller 843e12286f Improve prompts when amending commits
This fixes two minor problems with the prompts:

1. When pressing shift-A in the local commits view, it would first prompt
   whether to stage all files, and then it would prompt whether to amend the
   commit at all. This doesn't make sense, it needs to be the other way round.

2. When pressing shift-A on the head commit in an interactive rebase, we would
   ask whether they want to amend the last commit, like when pressing shift-A in
   the files view. While this is technically correct, the fact that we're
   amending the head commit in this case is just an implementation detail, and
   from the user's point of view it's better to use the same prompt as we do for
   any other commit.

To fix these, we remove the confirmation panel from AmendHelper.AmendHead() and
instead add it at the two call sites, so that we have more control over this.
2023-09-01 18:55:16 +02:00
..
advanced_interactive_rebase.go Use sentence case everywhere 2023-05-25 23:52:19 +10:00
amend_commit_with_conflict.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +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 Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
drop_todo_commit_with_update_ref.go Select same commit again after pressing "e" to edit a commit 2023-08-22 14:08:12 +02:00
drop_with_custom_comment_char.go Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
edit_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
edit_non_todo_commit_during_rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
edit_the_confl_commit.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
fixup_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
fixup_second_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
move_in_rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
move_with_custom_comment_char.go Use comment char config on interactive rebase 2023-07-02 02:07:32 -03:00
move.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
pick_rescheduled.go Add test for a pick that fails and gets rescheduled 2023-06-22 18:57:43 +02:00
rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10: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_with_editor.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
shared.go Insert fake todo entry for a conflicting commit that is being applied 2023-06-22 18:57:58 +02:00
squash_down_first_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
squash_down_second_commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
squash_fixups_above_first_commit.go Add busy count for integration tests 2023-07-08 22:54:52 +10:00
swap_in_rebase_with_conflict_and_edit.go Add a test for stopping at an "edit" command that conflicts 2023-06-22 18:57:58 +02:00
swap_in_rebase_with_conflict.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
swap_with_conflict.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00