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

simplify

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/app/app.go
View File

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

14
pkg/commands/git_commands/bisect_info.go
View File

@ -1,6 +1,10 @@
package git_commands 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 // 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 // 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 return false
} }
for _, status := range self.statusMap { return slices.Contains(maps.Values(self.statusMap), BisectStatusOld)
if status == BisectStatusOld {
return true
}
}
return false
} }