1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
This commit is contained in:
Jesse Duffield 2022-03-20 16:18:58 +11:00
parent 340a145bc8
commit 99e55725fb
2 changed files with 8 additions and 12 deletions

View File

@ -296,10 +296,8 @@ func (app *App) KnownError(err error) (string, bool) {
knownErrorMessages := []string{app.Tr.MinGitVersionError}
if message, ok := slices.Find(knownErrorMessages, func(knownErrorMessage string) bool {
return knownErrorMessage == errorMessage
}); ok {
return message, true
if slices.Contains(knownErrorMessages, errorMessage) {
return errorMessage, true
}
mappings := []errorMapping{

View File

@ -1,6 +1,10 @@
package git_commands
import "github.com/sirupsen/logrus"
import (
"github.com/jesseduffield/generics/maps"
"github.com/jesseduffield/generics/slices"
"github.com/sirupsen/logrus"
)
// although the typical terms in a git bisect are 'bad' and 'good', they're more
// generally known as 'new' and 'old'. Semi-recently git allowed the user to define
@ -93,11 +97,5 @@ func (self *BisectInfo) Bisecting() bool {
return false
}
for _, status := range self.statusMap {
if status == BisectStatusOld {
return true
}
}
return false
return slices.Contains(maps.Values(self.statusMap), BisectStatusOld)
}