handle both versions with and without leading v

Author: linkdata

internal/gitsemver/gitsemver_test.go

@@ -414,3 +414,29 @@ func Test_VersionStringer_GetTag_ClosestTagNotOverriddenByUnreachableSameTreeTag
 		t.Fatalf("expected sameTree false, got true")
 	}
 }
+
+func Test_VersionStringer_GetTag_PicksHighestMixedPrefixTagOnSameTree(t *testing.T) {
+	repo := t.TempDir()
+	runGit(t, repo, nil, "init", "-q")
+	runGit(t, repo, nil, "config", "user.email", "test@example.com")
+	runGit(t, repo, nil, "config", "user.name", "Test")
+
+	commitAt(t, repo, "a.txt", "a\n", "c1", "2020-01-01T00:00:00Z")
+	runGit(t, repo, nil, "tag", "v1.2.3")
+	runGit(t, repo, nil, "tag", "2.0.0")
+
+	vs, err := gitsemver.New("git", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	tag, sameTree, err := vs.GetTag(repo)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if tag != "2.0.0" {
+		t.Fatalf("expected highest mixed-prefix tag 2.0.0, got %q", tag)
+	}
+	if !sameTree {
+		t.Fatalf("expected sameTree true, got false")
+	}
+}

internal/gitsemver/gitter.go

@@ -10,6 +10,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"sort"
 	"strconv"
 	"strings"
 )
@@ -158,6 +159,20 @@ func (dg DefaultGitter) CheckGitRepo(dir string) (repo string, err error) {
 // with or without a leading "v".
 var reMatchSemver = regexp.MustCompile(`^v?[0-9]+(?:\.[0-9]+)?(?:\.[0-9]+)?$`)
 
+func semverKey(tag string) [3]int {
+	var key [3]int
+	core := strings.TrimPrefix(tag, "v")
+	parts := strings.Split(core, ".")
+	for i := 0; i < len(parts) && i < len(key); i++ {
+		n, err := strconv.Atoi(parts[i])
+		if err != nil {
+			break
+		}
+		key[i] = n
+	}
+	return key
+}
+
 // GetTags returns all tags, sorted by version descending.
 // The latest tag is the first in the list.
 func (dg DefaultGitter) GetTags(repo string) (tags []string, err error) {
@@ -168,6 +183,18 @@ func (dg DefaultGitter) GetTags(repo string) (tags []string, err error) {
 				tags = append(tags, tag)
 			}
 		}
+		// Git's multi-pattern listing can interleave v-prefixed and non-prefixed
+		// tags in a way that is not globally version-sorted. Normalize here.
+		sort.SliceStable(tags, func(i, j int) bool {
+			left := semverKey(tags[i])
+			right := semverKey(tags[j])
+			for idx := range left {
+				if left[idx] != right[idx] {
+					return left[idx] > right[idx]
+				}
+			}
+			return false
+		})
 	}
 	return
 }

internal/gitsemver/gitter_test.go

@@ -201,6 +201,30 @@ func Test_DefaultGitter_GetTags_IncludesSingleDigitSemverTags(t *testing.T) {
 	}
 }
 
+func Test_DefaultGitter_GetTags_SortsMixedPrefixSemverDescending(t *testing.T) {
+	repo := t.TempDir()
+	runGit(t, repo, nil, "init", "-q")
+	runGit(t, repo, nil, "config", "user.email", "test@example.com")
+	runGit(t, repo, nil, "config", "user.name", "Test")
+	commitAt(t, repo, "a.txt", "a\n", "c1", "2020-01-01T00:00:00Z")
+	runGit(t, repo, nil, "tag", "v1.2.3")
+	runGit(t, repo, nil, "tag", "2.0.0")
+	runGit(t, repo, nil, "tag", "v10.0.0")
+	runGit(t, repo, nil, "tag", "1.2.4")
+
+	dg, err := gitsemver.NewDefaultGitter("git", nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	tags, err := dg.GetTags(repo)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if slices.Compare(tags, []string{"v10.0.0", "2.0.0", "1.2.4", "v1.2.3"}) != 0 {
+		t.Fatalf("unexpected tags: %v", tags)
+	}
+}
+
 func Test_DefaultGitter_GetCurrentTreeHash(t *testing.T) {
 	dg, err := gitsemver.NewDefaultGitter("git", nil)
 	if err != nil {