mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-07-31 14:24:25 +03:00
Disregard master commits when finding base commit for fixup
If exactly one candidate from inside the current branch is found, we return that one even if there are also hunks belonging to master commits; we disregard those in this case.
This commit is contained in:
@ -35,7 +35,6 @@ var FindBaseCommitForFixupDisregardMainBranch = NewIntegrationTest(NewIntegratio
|
||||
Focus().
|
||||
Press(keys.Files.FindBaseCommitForFixup)
|
||||
|
||||
/* EXPECTED:
|
||||
t.Views().Commits().
|
||||
IsFocused().
|
||||
Lines(
|
||||
@ -44,13 +43,5 @@ var FindBaseCommitForFixupDisregardMainBranch = NewIntegrationTest(NewIntegratio
|
||||
Contains("2nd commit"),
|
||||
Contains("1st commit"),
|
||||
)
|
||||
*/
|
||||
|
||||
// ACTUAL:
|
||||
t.ExpectPopup().Alert().Title(Equals("Error")).Content(
|
||||
Contains("Multiple base commits found.").
|
||||
Contains("2nd commit").
|
||||
Contains("3rd commit"),
|
||||
).Confirm()
|
||||
},
|
||||
})
|
||||
|
Reference in New Issue
Block a user