summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2019-11-26 21:35:08 +1100
committerJesse Duffield <jessedduffield@gmail.com>2019-11-26 21:39:40 +1100
commit339e1b5dcfcdb39d99a5a01f5befb3b90cb1fb32 (patch)
tree7406591d1d7e3318cec0946a44a472da20b14f9d
parent7113ed73d4d776f0a0f19e715a717e0394ac3651 (diff)
lenient sorting of tags on startupv0.11.3
-rw-r--r--pkg/commands/loading_tags.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkg/commands/loading_tags.go b/pkg/commands/loading_tags.go
index ae2f0ba17..95ebb450c 100644
--- a/pkg/commands/loading_tags.go
+++ b/pkg/commands/loading_tags.go
@@ -3,6 +3,7 @@ package commands
import (
"regexp"
"sort"
+ "strconv"
"strings"
"github.com/jesseduffield/lazygit/pkg/utils"
@@ -10,6 +11,14 @@ import (
const semverRegex = `v?((\d+\.?)+)([^\d]?.*)`
+func convertToInt(s string) int {
+ i, err := strconv.Atoi(s)
+ if err != nil {
+ return 0
+ }
+ return i
+}
+
func (c *GitCommand) GetTags() ([]*Tag, error) {
// get remote branches
remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(`git tag --list`)
@@ -59,10 +68,10 @@ func (c *GitCommand) GetTags() ([]*Tag, error) {
if len(numbersB) == k {
return false
}
- if mustConvertToInt(numbersA[k]) < mustConvertToInt(numbersB[k]) {
+ if convertToInt(numbersA[k]) < convertToInt(numbersB[k]) {
return true
}
- if mustConvertToInt(numbersA[k]) > mustConvertToInt(numbersB[k]) {
+ if convertToInt(numbersA[k]) > convertToInt(numbersB[k]) {
return false
}
k++