summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-03-20 16:18:58 +1100
committerJesse Duffield <jessedduffield@gmail.com>2022-03-24 20:14:41 +1100
commit99e55725fb0783bc3280498ec6047350368c25d7 (patch)
treecd7e95d2daa3ff806a9f0146c5bac1c0c5d45bac /pkg
parent340a145bc8af32123550f6b4db5104f61417c019 (diff)
simplify
Diffstat (limited to 'pkg')
-rw-r--r--pkg/app/app.go6
-rw-r--r--pkg/commands/git_commands/bisect_info.go14
2 files changed, 8 insertions, 12 deletions
diff --git a/pkg/app/app.go b/pkg/app/app.go
index eeb1b849f..c81332df0 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -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{
diff --git a/pkg/commands/git_commands/bisect_info.go b/pkg/commands/git_commands/bisect_info.go
index 5b3b1f028..ea20d0d38 100644
--- a/pkg/commands/git_commands/bisect_info.go
+++ b/pkg/commands/git_commands/bisect_info.go
@@ -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)
}