go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-17 01:42:45 +02:00
Code Issues Releases Activity

lenient sorting of tags on startup

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-26 21:35:08 +11:00
parent 7113ed73d4
commit 339e1b5dcf
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/commands/loading_tags.go
View File

@ -3,6 +3,7 @@ package commands
import ( import (
"regexp" "regexp"
"sort" "sort"
"strconv"
"strings" "strings"
"github.com/jesseduffield/lazygit/pkg/utils" "github.com/jesseduffield/lazygit/pkg/utils"
@ -10,6 +11,14 @@ import (
const semverRegex = `v?((\d+\.?)+)([^\d]?.*)` 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) { func (c *GitCommand) GetTags() ([]*Tag, error) {
// get remote branches // get remote branches
remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(`git tag --list`) remoteBranchesStr, err := c.OSCommand.RunCommandWithOutput(`git tag --list`)
@ -59,10 +68,10 @@ func (c *GitCommand) GetTags() ([]*Tag, error) {
if len(numbersB) == k { if len(numbersB) == k {
return false return false
} }
if mustConvertToInt(numbersA[k]) < mustConvertToInt(numbersB[k]) { if convertToInt(numbersA[k]) < convertToInt(numbersB[k]) {
return true return true
} }
if mustConvertToInt(numbersA[k]) > mustConvertToInt(numbersB[k]) { if convertToInt(numbersA[k]) > convertToInt(numbersB[k]) {
return false return false
} }
k++ k++