mirror of
https://gitcode.com/gitea/gitea.git
synced 2025-05-25 02:56:55 +08:00
Update vendor git (#2765)
This commit is contained in:
13
vendor/code.gitea.io/git/commit.go
generated
vendored
13
vendor/code.gitea.io/git/commit.go
generated
vendored
@ -12,8 +12,6 @@ import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/mcuadros/go-version"
|
||||
)
|
||||
|
||||
// Commit represents a git commit.
|
||||
@ -160,13 +158,7 @@ func CommitChanges(repoPath string, opts CommitChangesOptions) error {
|
||||
|
||||
func commitsCount(repoPath, revision, relpath string) (int64, error) {
|
||||
var cmd *Command
|
||||
isFallback := false
|
||||
if version.Compare(gitVersion, "1.8.0", "<") {
|
||||
isFallback = true
|
||||
cmd = NewCommand("log", "--pretty=format:''")
|
||||
} else {
|
||||
cmd = NewCommand("rev-list", "--count")
|
||||
}
|
||||
cmd = NewCommand("rev-list", "--count")
|
||||
cmd.AddArguments(revision)
|
||||
if len(relpath) > 0 {
|
||||
cmd.AddArguments("--", relpath)
|
||||
@ -177,9 +169,6 @@ func commitsCount(repoPath, revision, relpath string) (int64, error) {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
if isFallback {
|
||||
return int64(strings.Count(stdout, "\n")) + 1, nil
|
||||
}
|
||||
return strconv.ParseInt(strings.TrimSpace(stdout), 10, 64)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user