Selaa lähdekoodia

vendor: update github.com/gogs/git-module

Unknwon 6 vuotta sitten
vanhempi
commit
8d091ec062

+ 16 - 0
vendor/github.com/gogs/git-module/commit.go

@@ -303,3 +303,19 @@ func GetCommitFileStatus(repoPath, commitID string) (*CommitFileStatus, error) {
 func (c *Commit) FileStatus() (*CommitFileStatus, error) {
 	return GetCommitFileStatus(c.repo.Path, c.ID.String())
 }
+
+// GetFullCommitID returns full length (40) of commit ID by given short SHA in a repository.
+func GetFullCommitID(repoPath, shortID string) (string, error) {
+	if len(shortID) >= 40 {
+		return shortID, nil
+	}
+
+	commitID, err := NewCommand("rev-parse", shortID).RunInDir(repoPath)
+	if err != nil {
+		if strings.Contains(err.Error(), "exit status 128") {
+			return "", ErrNotExist{shortID, ""}
+		}
+		return "", err
+	}
+	return strings.TrimSpace(commitID), nil
+}

+ 1 - 1
vendor/github.com/gogs/git-module/git.go

@@ -10,7 +10,7 @@ import (
 	"time"
 )
 
-const _VERSION = "0.6.5"
+const _VERSION = "0.6.6"
 
 func Version() string {
 	return _VERSION

+ 4 - 9
vendor/github.com/gogs/git-module/repo_commit.go

@@ -126,15 +126,10 @@ func (repo *Repository) getCommit(id sha1) (*Commit, error) {
 
 // GetCommit returns commit object of by ID string.
 func (repo *Repository) GetCommit(commitID string) (*Commit, error) {
-	if len(commitID) != 40 {
-		var err error
-		commitID, err = NewCommand("rev-parse", commitID).RunInDir(repo.Path)
-		if err != nil {
-			if strings.Contains(err.Error(), "exit status 128") {
-				return nil, ErrNotExist{commitID, ""}
-			}
-			return nil, err
-		}
+	var err error
+	commitID, err = GetFullCommitID(repo.Path, commitID)
+	if err != nil {
+		return nil, fmt.Errorf("GetCommitFullID: %v", err)
 	}
 	id, err := NewIDFromString(commitID)
 	if err != nil {

+ 3 - 3
vendor/vendor.json

@@ -207,10 +207,10 @@
 			"revisionTime": "2017-03-01T03:54:11Z"
 		},
 		{
-			"checksumSHA1": "KNGYbPsHRTay+Mo08T0eWwqeOb4=",
+			"checksumSHA1": "183Lk59tqgDzO3eZeer4g1w/hk0=",
 			"path": "github.com/gogs/git-module",
-			"revision": "483e6638258058b08679cf0c7010a13597de4978",
-			"revisionTime": "2018-05-27T13:41:17Z"
+			"revision": "c64f3cabc82d33dfdb0cd47a5dda4e29368f3da2",
+			"revisionTime": "2018-06-03T12:25:16Z"
 		},
 		{
 			"checksumSHA1": "MLO0PyrK2MUO6A7Z9PxWuu43C/A=",