go-version constraints ignore pre-releases

zeripath · wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf · commit 7cbfce5e0db8 · 2020-10-21T15:51:00.000+02:00
Go-version constraints ignore pre-releases. Rather than change the library further this PR simply changes the git version comparison to use simple version compare ignoring the issue of pre-releases. PR for this go-gitea#13234 Signed-off-by: Andrew Thornton <art27@cantab.net> Signed-off-by: wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf <a_mirre@utb.cz>
diff --git a/modules/git/commit.go b/modules/git/commit.go
@@ -477,7 +477,7 @@ func (c *Commit) GetBranchName() (string, error) {
 	args := []string{
 		"name-rev",
 	}
-	if CheckGitVersionConstraint(">= 2.13.0") == nil {
+	if CheckGitVersionAtLeast("2.13.0") == nil {
 		args = append(args, "--exclude", "refs/tags/*")
 	}
 	args = append(args, "--name-only", "--no-undefined", c.ID.String())
diff --git a/modules/git/git.go b/modules/git/git.go
@@ -150,13 +150,13 @@ func Init(ctx context.Context) error {
 		return err
 	}
 
-	if CheckGitVersionConstraint(">= 2.10") == nil {
+	if CheckGitVersionAtLeast("2.10") == nil {
 		if err := checkAndSetConfig("receive.advertisePushOptions", "true", true); err != nil {
 			return err
 		}
 	}
 
-	if CheckGitVersionConstraint(">= 2.18") == nil {
+	if CheckGitVersionAtLeast("2.18") == nil {
 		if err := checkAndSetConfig("core.commitGraph", "true", true); err != nil {
 			return err
 		}
@@ -173,17 +173,17 @@ func Init(ctx context.Context) error {
 	return nil
 }
 
-// CheckGitVersionConstraint check version constrain against local installed git version
-func CheckGitVersionConstraint(constraint string) error {
+// CheckGitVersionAtLeast check git version is at least the constraint version
+func CheckGitVersionAtLeast(atLeast string) error {
 	if err := LoadGitVersion(); err != nil {
 		return err
 	}
-	check, err := version.NewConstraint(constraint)
+	atLeastVersion, err := version.NewVersion(atLeast)
 	if err != nil {
 		return err
 	}
-	if !check.Check(gitVersion) {
-		return fmt.Errorf("installed git binary  %s does not satisfy version constraint %s", gitVersion.Original(), constraint)
+	if gitVersion.Compare(atLeastVersion) < 0 {
+		return fmt.Errorf("installed git binary version %s is not at least %s", gitVersion.Original(), atLeast)
 	}
 	return nil
 }
diff --git a/modules/git/repo_attribute.go b/modules/git/repo_attribute.go
@@ -40,7 +40,7 @@ func (repo *Repository) CheckAttribute(opts CheckAttributeOpts) (map[string]map[
 	}
 
 	// git check-attr --cached first appears in git 1.7.8
-	if opts.CachedOnly && CheckGitVersionConstraint(">= 1.7.8") == nil {
+	if opts.CachedOnly && CheckGitVersionAtLeast("1.7.8") == nil {
 		cmdArgs = append(cmdArgs, "--cached")
 	}
 
diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go
@@ -469,7 +469,7 @@ func (repo *Repository) getCommitsBeforeLimit(id SHA1, num int) (*list.List, err
 }
 
 func (repo *Repository) getBranches(commit *Commit, limit int) ([]string, error) {
-	if CheckGitVersionConstraint(">= 2.7.0") == nil {
+	if CheckGitVersionAtLeast("2.7.0") == nil {
 		stdout, err := NewCommand("for-each-ref", "--count="+strconv.Itoa(limit), "--format=%(refname:strip=2)", "--contains", commit.ID.String(), BranchPrefix).RunInDir(repo.Path)
 		if err != nil {
 			return nil, err
diff --git a/modules/git/repo_tree.go b/modules/git/repo_tree.go
@@ -89,11 +89,11 @@ func (repo *Repository) CommitTree(author *Signature, committer *Signature, tree
 	_, _ = messageBytes.WriteString(opts.Message)
 	_, _ = messageBytes.WriteString("\n")
 
-	if CheckGitVersionConstraint(">= 1.7.9") == nil && (opts.KeyID != "" || opts.AlwaysSign) {
+	if CheckGitVersionAtLeast("1.7.9") == nil && (opts.KeyID != "" || opts.AlwaysSign) {
 		cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID))
 	}
 
-	if CheckGitVersionConstraint(">= 2.0.0") == nil && opts.NoGPGSign {
+	if CheckGitVersionAtLeast("2.0.0") == nil && opts.NoGPGSign {
 		cmd.AddArguments("--no-gpg-sign")
 	}
 
diff --git a/modules/repofiles/temp_repo.go b/modules/repofiles/temp_repo.go
@@ -214,7 +214,7 @@ func (t *TemporaryUploadRepository) CommitTreeWithDate(author, committer *models
 	args := []string{"commit-tree", treeHash, "-p", "HEAD"}
 
 	// Determine if we should sign
-	if git.CheckGitVersionConstraint(">= 1.7.9") == nil {
+	if git.CheckGitVersionAtLeast("1.7.9") == nil {
 		sign, keyID, signer, _ := t.repo.SignCRUDAction(author, t.basePath, "HEAD")
 		if sign {
 			args = append(args, "-S"+keyID)
@@ -231,7 +231,7 @@ func (t *TemporaryUploadRepository) CommitTreeWithDate(author, committer *models
 				}
 				committerSig = signer
 			}
-		} else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {
+		} else if git.CheckGitVersionAtLeast("2.0.0") == nil {
 			args = append(args, "--no-gpg-sign")
 		}
 	}
@@ -335,7 +335,7 @@ func (t *TemporaryUploadRepository) CheckAttribute(attribute string, args ...str
 	cmdArgs := []string{"check-attr", "-z", attribute}
 
 	// git check-attr --cached first appears in git 1.7.8
-	if git.CheckGitVersionConstraint(">= 1.7.8") == nil {
+	if git.CheckGitVersionAtLeast("1.7.8") == nil {
 		cmdArgs = append(cmdArgs, "--cached")
 	}
 	cmdArgs = append(cmdArgs, "--")
diff --git a/modules/repository/init.go b/modules/repository/init.go
@@ -131,7 +131,7 @@ func initRepoCommit(tmpPath string, repo *models.Repository, u *models.User, def
 		"-m", "Initial commit",
 	}
 
-	if git.CheckGitVersionConstraint(">= 1.7.9") == nil {
+	if git.CheckGitVersionAtLeast("1.7.9") == nil {
 		sign, keyID, signer, _ := models.SignInitialCommit(tmpPath, u)
 		if sign {
 			args = append(args, "-S"+keyID)
@@ -141,7 +141,7 @@ func initRepoCommit(tmpPath string, repo *models.Repository, u *models.User, def
 				committerName = signer.Name
 				committerEmail = signer.Email
 			}
-		} else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {
+		} else if git.CheckGitVersionAtLeast("2.0.0") == nil {
 			args = append(args, "--no-gpg-sign")
 		}
 	}
diff --git a/modules/setting/git.go b/modules/setting/git.go
@@ -74,15 +74,15 @@ func newGit() {
 		log.Fatal("Error retrieving git version: %v", err)
 	}
 
-	if git.CheckGitVersionConstraint(">= 2.9") == nil {
+	if git.CheckGitVersionAtLeast("2.9") == nil {
 		// Explicitly disable credential helper, otherwise Git credentials might leak
 		git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "credential.helper=")
 	}
 
 	var format = "Git Version: %s"
 	var args = []interface{}{version.Original()}
 	// Since git wire protocol has been released from git v2.18
-	if Git.EnableAutoGitWireProtocol && git.CheckGitVersionConstraint(">= 2.18") == nil {
+	if Git.EnableAutoGitWireProtocol && git.CheckGitVersionAtLeast("2.18") == nil {
 		git.GlobalCommandArgs = append(git.GlobalCommandArgs, "-c", "protocol.version=2")
 		format += ", Wire Protocol %s Enabled"
 		args = append(args, "Version 2") // for focus color
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
@@ -96,7 +96,7 @@ func CheckLFSVersion() {
 			log.Fatal("Error retrieving git version: %v", err)
 		}
 
-		if git.CheckGitVersionConstraint(">= 2.1.2") != nil {
+		if git.CheckGitVersionAtLeast("2.1.2") != nil {
 			LFS.StartServer = false
 			log.Error("LFS server support needs at least Git v2.1.2")
 		} else {
diff --git a/routers/repo/lfs.go b/routers/repo/lfs.go
@@ -584,7 +584,7 @@ func LFSPointerFiles(ctx *context.Context) {
 	go createPointerResultsFromCatFileBatch(catFileBatchReader, &wg, pointerChan, ctx.Repo.Repository, ctx.User)
 	go pipeline.CatFileBatch(shasToBatchReader, catFileBatchWriter, &wg, basePath)
 	go pipeline.BlobsLessThan1024FromCatFileBatchCheck(catFileCheckReader, shasToBatchWriter, &wg)
-	if git.CheckGitVersionConstraint(">= 2.6.0") != nil {
+	if git.CheckGitVersionAtLeast("2.6.0") != nil {
 		revListReader, revListWriter := io.Pipe()
 		shasToCheckReader, shasToCheckWriter := io.Pipe()
 		wg.Add(2)
diff --git a/services/mirror/mirror.go b/services/mirror/mirror.go
@@ -46,7 +46,7 @@ func remoteAddress(repoPath string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	if git.CheckGitVersionConstraint(">= 2.7") == nil {
+	if git.CheckGitVersionAtLeast("2.7") == nil {
 		cmd = git.NewCommand("remote", "get-url", "origin")
 	} else {
 		cmd = git.NewCommand("config", "--get", "remote.origin.url")
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -155,7 +155,7 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
 	}
 
 	var gitConfigCommand func() *git.Command
-	if git.CheckGitVersionConstraint(">= 1.8.0") == nil {
+	if git.CheckGitVersionAtLeast("1.8.0") == nil {
 		gitConfigCommand = func() *git.Command {
 			return git.NewCommand("config", "--local")
 		}
@@ -214,14 +214,14 @@ func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.Merge
 
 	// Determine if we should sign
 	signArg := ""
-	if git.CheckGitVersionConstraint(">= 1.7.9") == nil {
+	if git.CheckGitVersionAtLeast("1.7.9") == nil {
 		sign, keyID, signer, _ := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
 		if sign {
 			signArg = "-S" + keyID
 			if pr.BaseRepo.GetTrustModel() == models.CommitterTrustModel || pr.BaseRepo.GetTrustModel() == models.CollaboratorCommitterTrustModel {
 				committer = signer
 			}
-		} else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {
+		} else if git.CheckGitVersionAtLeast("2.0.0") == nil {
 			signArg = "--no-gpg-sign"
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ func (c *Commit) GetBranchName() (string, error) {`
`477`	`477`	`args := []string{`
`478`	`478`	`"name-rev",`
`479`	`479`	`}`
`480`		`- if CheckGitVersionConstraint(">= 2.13.0") == nil {`
	`480`	`+ if CheckGitVersionAtLeast("2.13.0") == nil {`
`481`	`481`	`args = append(args, "--exclude", "refs/tags/*")`
`482`	`482`	`}`
`483`	`483`	`args = append(args, "--name-only", "--no-undefined", c.ID.String())`
Original file line number	Diff line number	Diff line change
`@@ -150,13 +150,13 @@ func Init(ctx context.Context) error {`
`150`	`150`	`return err`
`151`	`151`	`}`
`152`	`152`
`153`		`- if CheckGitVersionConstraint(">= 2.10") == nil {`
	`153`	`+ if CheckGitVersionAtLeast("2.10") == nil {`
`154`	`154`	`if err := checkAndSetConfig("receive.advertisePushOptions", "true", true); err != nil {`
`155`	`155`	`return err`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
`159`		`- if CheckGitVersionConstraint(">= 2.18") == nil {`
	`159`	`+ if CheckGitVersionAtLeast("2.18") == nil {`
`160`	`160`	`if err := checkAndSetConfig("core.commitGraph", "true", true); err != nil {`
`161`	`161`	`return err`
`162`	`162`	`}`
`@@ -173,17 +173,17 @@ func Init(ctx context.Context) error {`
`173`	`173`	`return nil`
`174`	`174`	`}`
`175`	`175`
`176`		`-// CheckGitVersionConstraint check version constrain against local installed git version`
`177`		`-func CheckGitVersionConstraint(constraint string) error {`
	`176`	`+// CheckGitVersionAtLeast check git version is at least the constraint version`
	`177`	`+func CheckGitVersionAtLeast(atLeast string) error {`
`178`	`178`	`if err := LoadGitVersion(); err != nil {`
`179`	`179`	`return err`
`180`	`180`	`}`
`181`		`- check, err := version.NewConstraint(constraint)`
	`181`	`+ atLeastVersion, err := version.NewVersion(atLeast)`
`182`	`182`	`if err != nil {`
`183`	`183`	`return err`
`184`	`184`	`}`
`185`		`- if !check.Check(gitVersion) {`
`186`		`- return fmt.Errorf("installed git binary %s does not satisfy version constraint %s", gitVersion.Original(), constraint)`
	`185`	`+ if gitVersion.Compare(atLeastVersion) < 0 {`
	`186`	`+ return fmt.Errorf("installed git binary version %s is not at least %s", gitVersion.Original(), atLeast)`
`187`	`187`	`}`
`188`	`188`	`return nil`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (repo *Repository) CheckAttribute(opts CheckAttributeOpts) (map[string]map[`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`// git check-attr --cached first appears in git 1.7.8`
`43`		`- if opts.CachedOnly && CheckGitVersionConstraint(">= 1.7.8") == nil {`
	`43`	`+ if opts.CachedOnly && CheckGitVersionAtLeast("1.7.8") == nil {`
`44`	`44`	`cmdArgs = append(cmdArgs, "--cached")`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ func (repo Repository) getCommitsBeforeLimit(id SHA1, num int) (list.List, err`
`469`	`469`	`}`
`470`	`470`
`471`	`471`	`func (repo Repository) getBranches(commit Commit, limit int) ([]string, error) {`
`472`		`- if CheckGitVersionConstraint(">= 2.7.0") == nil {`
	`472`	`+ if CheckGitVersionAtLeast("2.7.0") == nil {`
`473`	`473`	`stdout, err := NewCommand("for-each-ref", "--count="+strconv.Itoa(limit), "--format=%(refname:strip=2)", "--contains", commit.ID.String(), BranchPrefix).RunInDir(repo.Path)`
`474`	`474`	`if err != nil {`
`475`	`475`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -89,11 +89,11 @@ func (repo Repository) CommitTree(author Signature, committer *Signature, tree`
`89`	`89`	`_, _ = messageBytes.WriteString(opts.Message)`
`90`	`90`	`_, _ = messageBytes.WriteString("\n")`
`91`	`91`
`92`		`- if CheckGitVersionConstraint(">= 1.7.9") == nil && (opts.KeyID != "" \|\| opts.AlwaysSign) {`
	`92`	`+ if CheckGitVersionAtLeast("1.7.9") == nil && (opts.KeyID != "" \|\| opts.AlwaysSign) {`
`93`	`93`	`cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID))`
`94`	`94`	`}`
`95`	`95`
`96`		`- if CheckGitVersionConstraint(">= 2.0.0") == nil && opts.NoGPGSign {`
	`96`	`+ if CheckGitVersionAtLeast("2.0.0") == nil && opts.NoGPGSign {`
`97`	`97`	`cmd.AddArguments("--no-gpg-sign")`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ func (t TemporaryUploadRepository) CommitTreeWithDate(author, committer models`
`214`	`214`	`args := []string{"commit-tree", treeHash, "-p", "HEAD"}`
`215`	`215`
`216`	`216`	`// Determine if we should sign`
`217`		`- if git.CheckGitVersionConstraint(">= 1.7.9") == nil {`
	`217`	`+ if git.CheckGitVersionAtLeast("1.7.9") == nil {`
`218`	`218`	`sign, keyID, signer, _ := t.repo.SignCRUDAction(author, t.basePath, "HEAD")`
`219`	`219`	`if sign {`
`220`	`220`	`args = append(args, "-S"+keyID)`
`@@ -231,7 +231,7 @@ func (t TemporaryUploadRepository) CommitTreeWithDate(author, committer models`
`231`	`231`	`}`
`232`	`232`	`committerSig = signer`
`233`	`233`	`}`
`234`		`- } else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {`
	`234`	`+ } else if git.CheckGitVersionAtLeast("2.0.0") == nil {`
`235`	`235`	`args = append(args, "--no-gpg-sign")`
`236`	`236`	`}`
`237`	`237`	`}`
`@@ -335,7 +335,7 @@ func (t *TemporaryUploadRepository) CheckAttribute(attribute string, args ...str`
`335`	`335`	`cmdArgs := []string{"check-attr", "-z", attribute}`
`336`	`336`
`337`	`337`	`// git check-attr --cached first appears in git 1.7.8`
`338`		`- if git.CheckGitVersionConstraint(">= 1.7.8") == nil {`
	`338`	`+ if git.CheckGitVersionAtLeast("1.7.8") == nil {`
`339`	`339`	`cmdArgs = append(cmdArgs, "--cached")`
`340`	`340`	`}`
`341`	`341`	`cmdArgs = append(cmdArgs, "--")`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ func initRepoCommit(tmpPath string, repo models.Repository, u models.User, def`
`131`	`131`	`"-m", "Initial commit",`
`132`	`132`	`}`
`133`	`133`
`134`		`- if git.CheckGitVersionConstraint(">= 1.7.9") == nil {`
	`134`	`+ if git.CheckGitVersionAtLeast("1.7.9") == nil {`
`135`	`135`	`sign, keyID, signer, _ := models.SignInitialCommit(tmpPath, u)`
`136`	`136`	`if sign {`
`137`	`137`	`args = append(args, "-S"+keyID)`
`@@ -141,7 +141,7 @@ func initRepoCommit(tmpPath string, repo models.Repository, u models.User, def`
`141`	`141`	`committerName = signer.Name`
`142`	`142`	`committerEmail = signer.Email`
`143`	`143`	`}`
`144`		`- } else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {`
	`144`	`+ } else if git.CheckGitVersionAtLeast("2.0.0") == nil {`
`145`	`145`	`args = append(args, "--no-gpg-sign")`
`146`	`146`	`}`
`147`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func CheckLFSVersion() {`
`96`	`96`	`log.Fatal("Error retrieving git version: %v", err)`
`97`	`97`	`}`
`98`	`98`
`99`		`- if git.CheckGitVersionConstraint(">= 2.1.2") != nil {`
	`99`	`+ if git.CheckGitVersionAtLeast("2.1.2") != nil {`
`100`	`100`	`LFS.StartServer = false`
`101`	`101`	`log.Error("LFS server support needs at least Git v2.1.2")`
`102`	`102`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func remoteAddress(repoPath string) (string, error) {`
`46`	`46`	`if err != nil {`
`47`	`47`	`return "", err`
`48`	`48`	`}`
`49`		`- if git.CheckGitVersionConstraint(">= 2.7") == nil {`
	`49`	`+ if git.CheckGitVersionAtLeast("2.7") == nil {`
`50`	`50`	`cmd = git.NewCommand("remote", "get-url", "origin")`
`51`	`51`	`} else {`
`52`	`52`	`cmd = git.NewCommand("config", "--get", "remote.origin.url")`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func rawMerge(pr models.PullRequest, doer models.User, mergeStyle models.Merge`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`var gitConfigCommand func() *git.Command`
`158`		`- if git.CheckGitVersionConstraint(">= 1.8.0") == nil {`
	`158`	`+ if git.CheckGitVersionAtLeast("1.8.0") == nil {`
`159`	`159`	`gitConfigCommand = func() *git.Command {`
`160`	`160`	`return git.NewCommand("config", "--local")`
`161`	`161`	`}`
`@@ -214,14 +214,14 @@ func rawMerge(pr models.PullRequest, doer models.User, mergeStyle models.Merge`
`214`	`214`
`215`	`215`	`// Determine if we should sign`
`216`	`216`	`signArg := ""`
`217`		`- if git.CheckGitVersionConstraint(">= 1.7.9") == nil {`
	`217`	`+ if git.CheckGitVersionAtLeast("1.7.9") == nil {`
`218`	`218`	`sign, keyID, signer, _ := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)`
`219`	`219`	`if sign {`
`220`	`220`	`signArg = "-S" + keyID`
`221`	`221`	`if pr.BaseRepo.GetTrustModel() == models.CommitterTrustModel \|\| pr.BaseRepo.GetTrustModel() == models.CollaboratorCommitterTrustModel {`
`222`	`222`	`committer = signer`
`223`	`223`	`}`
`224`		`- } else if git.CheckGitVersionConstraint(">= 2.0.0") == nil {`
	`224`	`+ } else if git.CheckGitVersionAtLeast("2.0.0") == nil {`
`225`	`225`	`signArg = "--no-gpg-sign"`
`226`	`226`	`}`
`227`	`227`	`}`