瀏覽代碼

Update to the most recent go-git

Vadim Markovtsev 8 年之前
父節點
當前提交
7d90dc6a55
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      analyser.go
  2. 1 1
      cmd/hercules/main.go

+ 2 - 2
analyser.go

@@ -594,7 +594,7 @@ func (analyser *Analyser) getBlob(entry *object.ChangeEntry, commit *object.Comm
 	*object.Blob, error) {
 	blob, err := analyser.Repository.BlobObject(entry.TreeEntry.Hash)
 	if err != nil {
-		if err.Error() != git.ErrObjectNotFound.Error() {
+		if err.Error() != plumbing.ErrObjectNotFound.Error() {
 			fmt.Fprintf(os.Stderr, "getBlob(%s)\n", entry.TreeEntry.Hash.String())
 			return nil, err
 		}
@@ -638,7 +638,7 @@ func (analyser *Analyser) cacheBlobs(changes *object.Changes, commit *object.Com
 		case merkletrie.Delete:
 			cache[change.From.TreeEntry.Hash], err = analyser.getBlob(&change.From, commit)
 			if err != nil {
-				if err.Error() != git.ErrObjectNotFound.Error() {
+				if err.Error() != plumbing.ErrObjectNotFound.Error() {
 					fmt.Fprintf(os.Stderr, "file from %s\n", change.From.Name)
 				} else {
 					cache[change.From.TreeEntry.Hash], err = createDummyBlob(

+ 1 - 1
cmd/hercules/main.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"strings"
 
-	"gopkg.in/src-d/go-billy.v2/osfs"
+	"gopkg.in/src-d/go-billy.v3/osfs"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/object"