Magic Git tag transformations are awesome too

openshift · Sep 16, 2016 · d451518 · d451518
1 parent 469bcee
commit d451518
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -69,7 +69,7 @@ func (info Info) LastSemanticVersion() string {
 		parts = parts[:len(parts)-1]
 	}
 	// strip the Git commit
-	if len(parts) > 1 && reCommitSegment.MatchString(parts[len(parts)-1]) {
+	if len(parts) > 0 && reCommitSegment.MatchString(parts[len(parts)-1]) {
 		parts[len(parts)-1] = reCommitSegment.ReplaceAllString(parts[len(parts)-1], "")
 		if len(parts[len(parts)-1]) == 0 {
 			parts = parts[:len(parts)-1]

diff --git a/pkg/version/version_test.go b/pkg/version/version_test.go
@@ -11,6 +11,8 @@ func TestLastSemanticVersion(t *testing.T) {
 		{"v1.3-11+abcdef-dirty", "v1.3"},
 		{"v1.3-11+abcdef", "v1.3"},
 		{"v1.3-11", "v1.3-11"},
+		{"v1.3.0+abcdef", "v1.3.0"},
+		{"v1.3+abcdef", "v1.3"},
 		{"v1.3.0-alpha.1", "v1.3.0-alpha.1"},
 		{"v1.3.0-alpha.1-dirty", "v1.3.0-alpha.1"},
 		{"v1.3.0-alpha.1+abc-dirty", "v1.3.0-alpha.1+abc"},