improve gogit build

Author: lunny

modules/git/notes_gogit.go

@@ -31,7 +31,11 @@ func GetNote(ctx context.Context, repo *Repository, commitID string, note *Note)
 	remainingCommitID := commitID
 	path := ""
 	tree := NewTree(repo, notes.TreeID)
-	currentTree := tree.gogitTree
+	currentTree, err := tree.getGogitTree()
+	if err != nil {
+		log.Error("Unable to get git tree for notes commit %q. Error: %v", notes.ID, err)
+		return err
+	}
 	log.Trace("Found tree with ID %q while searching for git note corresponding to the commit %q", currentTree.Entries[0].Name, commitID)
 	var file *object.File
 	for len(remainingCommitID) > 2 {

modules/git/tree.go

@@ -12,6 +12,14 @@ import (
 	"code.gitea.io/gitea/modules/util"
 )
 
+// NewTree create a new tree according the repository and tree id
+func NewTree(repo *Repository, id ObjectID) *Tree {
+	return &Tree{
+		ID:   id,
+		repo: repo,
+	}
+}
+
 // SubTree get a subtree by the sub dir path
 func (t *Tree) SubTree(rpath string) (*Tree, error) {
 	if len(rpath) == 0 {

modules/git/tree_entry_gogit.go

@@ -7,6 +7,7 @@
 package git
 
 import (
+	"code.gitea.io/gitea/modules/log"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/filemode"
 	"github.com/go-git/go-git/v5/plumbing/object"
@@ -41,6 +42,11 @@ func (te *TreeEntry) Size() int64 {
 		return te.size
 	}
 
+	if err := te.ptree.loadTreeObject(); err != nil {
+		log.Error("Unable to load tree object: %v", err)
+		return 0
+	}
+
 	file, err := te.ptree.gogitTree.TreeEntryFile(te.gogitTreeEntry)
 	if err != nil {
 		return 0

modules/git/tree_gogit.go

@@ -27,21 +27,10 @@ type Tree struct {
 	submoduleCache *ObjectCache[*SubModule]
 }
 
-// NewTree create a new tree according the repository and tree id
-func NewTree(repo *Repository, id ObjectID) *Tree {
-	tree, err := object.GetTree(repo.gogitRepo.Storer, plumbing.Hash(id.RawValue()))
-	if err != nil {
+func (t *Tree) loadTreeObject() error {
+	if t.gogitTree != nil {
 		return nil
 	}
-
-	return &Tree{
-		ID:        id,
-		repo:      repo,
-		gogitTree: tree,
-	}
-}
-
-func (t *Tree) loadTreeObject() error {
 	gogitTree, err := t.repo.gogitRepo.TreeObject(plumbing.Hash(t.ID.RawValue()))
 	if err != nil {
 		return err
@@ -53,11 +42,8 @@ func (t *Tree) loadTreeObject() error {
 
 // ListEntries returns all entries of current tree.
 func (t *Tree) ListEntries() (Entries, error) {
-	if t.gogitTree == nil {
-		err := t.loadTreeObject()
-		if err != nil {
-			return nil, err
-		}
+	if err := t.loadTreeObject(); err != nil {
+		return nil, err
 	}
 
 	entries := make([]*TreeEntry, len(t.gogitTree.Entries))
@@ -74,11 +60,9 @@ func (t *Tree) ListEntries() (Entries, error) {
 
 // ListEntriesRecursiveWithSize returns all entries of current tree recursively including all subtrees
 func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) {
-	if t.gogitTree == nil {
-		err := t.loadTreeObject()
-		if err != nil {
-			return nil, err
-		}
+	err := t.loadTreeObject()
+	if err != nil {
+		return nil, err
 	}
 
 	var entries []*TreeEntry

modules/git/tree_nogogit.go

@@ -28,14 +28,6 @@ type Tree struct {
 	submoduleCache *ObjectCache[*SubModule]
 }
 
-// NewTree create a new tree according the repository and tree id
-func NewTree(repo *Repository, id ObjectID) *Tree {
-	return &Tree{
-		ID:   id,
-		repo: repo,
-	}
-}
-
 // ListEntries returns all entries of current tree.
 func (t *Tree) ListEntries() (Entries, error) {
 	if t.entriesParsed {