mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 20:36:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Disable dropping merge commits if it's not a single selection

Browse source
This commit is contained in:
Stefan Haller 2024-11-30 15:32:03 +01:00
parent bd0d9ef259
commit d5f2fb6003
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/gui/controllers/local_commits_controller.go
View file

@ -1448,6 +1448,10 @@ func (self *LocalCommitsController) midRebaseMoveCommandEnabled(selectedCommits
func (self *LocalCommitsController) canDropCommits(selectedCommits []*models.Commit, startIdx int, endIdx int) *types.DisabledReason {
if !self.isRebasing() {
if len(selectedCommits) > 1 && lo.SomeBy(selectedCommits, func(c *models.Commit) bool { return c.IsMerge() }) {
return &types.DisabledReason{Text: self.c.Tr.DroppingMergeRequiresSingleSelection}
}
return nil
}