go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-05 00:59:19 +02:00
Code Issues Releases Activity

Remove the "Select parent commit" prompt when reverting a merge commit

Browse Source 
In pretty much 100% of the cases, you want to use -m1, so spare users the
complexity of a confusing prompt.

See
https://public-inbox.org/git/e60a8b1a-98c8-4ac7-b966-ff9635bb781d@haller-berlin.de/
for some discussion.
This commit is contained in:
Stefan Haller
2025-03-30 11:54:40 +02:00
parent c13c6356e3
commit f14a3cdd46
4 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/integration/tests/commit/revert_merge.go
View File

@ -21,14 +21,9 @@ var RevertMerge = NewIntegrationTest(NewIntegrationTestArgs{
).
Press(keys.Commits.RevertCommit)
t.ExpectPopup().Menu().
Title(Equals("Select parent commit for merge")).
Lines(
Contains("first change"),
Contains("second-change-branch unrelated change"),
Contains("Cancel"),
).
Select(Contains("first change")).
t.ExpectPopup().Confirmation().
Title(Equals("Revert commit")).
Content(MatchesRegexp(`Are you sure you want to revert \w+?`)).
Confirm()
t.Views().Commits().IsFocused().