version: cut 'g' prefix from hash part of tarantool version

Author: elhimov

cli/install/install.go

@@ -1255,13 +1255,11 @@ func isUpdatePossible(installCtx InstallCtx,
 				if err != nil {
 					return false, err
 				}
-				// We need to trim first rune to get commit hash
-				// from string structure 'g<commitHash>'.
-				if len(binVersion.Hash) < 1 {
+				if len(binVersion.Hash) == 0 {
 					return false, fmt.Errorf("could not get commit hash of the version"+
 						"of an installed %s", program)
 				}
-				curBinHash = binVersion.Hash[1:]
+				curBinHash = binVersion.Hash
 			} else if program == search.ProgramTt {
 				ttVer, err := cmdcontext.GetTtVersion(pathToBin)
 				if err != nil {

cli/version/version_tools.go

@@ -85,7 +85,7 @@ func createVersionRegexp(isStrict bool) *regexp.Regexp {
 		`v?(?:(?P<major>\d+)){1}(?:\.(?P<minor>\d+)){1}(?:\.(?P<patch>\d+)){1}` +
 		`(?:-(?P<release>entrypoint|rc|alpha|beta)(?P<releaseNum>\d+)?)?` +
 		`(?:-(?P<additional>\d+))?` +
-		`(?:-(?P<hash>g[a-f0-9]+))?(?:-r(?P<revision>\d+))?(-gc64|-nogc64)?$`
+		`(?:-g(?P<hash>[a-f0-9]+))?(?:-r(?P<revision>\d+))?(-gc64|-nogc64)?$`
 	if !isStrict {
 		matchString = strings.Replace(matchString, "{1}", "?", 3)
 	}

cli/version/version_tools_test.go

@@ -24,7 +24,7 @@ func TestParseVersion(t *testing.T) {
 			Patch:      42,
 			Release:    Release{Type: TypeAlpha, Num: 2, str: "alpha2"},
 			Additional: 91,
-			Hash:       "g08c9b4963",
+			Hash:       "08c9b4963",
 			Revision:   482,
 			Str:        "2.10.42-alpha2-91-g08c9b4963-r482",
 		},
@@ -38,7 +38,7 @@ func TestParseVersion(t *testing.T) {
 			Patch:      13,
 			Release:    Release{Type: TypeRelease},
 			Additional: 48,
-			Hash:       "ga3a42eec7",
+			Hash:       "a3a42eec7",
 			Revision:   496,
 			Str:        "1.10.13-48-ga3a42eec7-r496",
 		},
@@ -52,7 +52,7 @@ func TestParseVersion(t *testing.T) {
 			Patch:      0,
 			Release:    Release{Type: TypeRelease},
 			Additional: 0,
-			Hash:       "gc9673ebb7",
+			Hash:       "c9673ebb7",
 			Revision:   575,
 			Str:        "2.11.0-0-gc9673ebb7-r575-nogc64",
 		},
@@ -66,7 +66,7 @@ func TestParseVersion(t *testing.T) {
 			Patch:      0,
 			Release:    Release{Type: TypeRelease},
 			Additional: 0,
-			Hash:       "gc9673ebb7",
+			Hash:       "c9673ebb7",
 			Revision:   575,
 			Str:        "2.11.0-0-gc9673ebb7-r575-gc64",
 		},
@@ -80,7 +80,7 @@ func TestParseVersion(t *testing.T) {
 			Patch:      123,
 			Release:    Release{Type: TypeRC, Num: 1, str: "rc1"},
 			Additional: 100,
-			Hash:       "g2ba6c0",
+			Hash:       "2ba6c0",
 			Str:        "1.10.123-rc1-100-g2ba6c0",
 		},
 		nil,