Fix build

Signed-off-by: Filip Navara <[email protected]>

Author: filipnavara

modules/git/commit_info.go

@@ -123,7 +123,7 @@ func getLastCommitForPaths(c *object.Commit, treePath string, paths []string) (m
 	// We do a tree traversal with nodes sorted by commit time
 	seen := make(map[plumbing.Hash]bool)
 	heap := binaryheap.NewWith(func(a, b interface{}) int {
-		if a.(*commitAndPaths).commit.CommitTime().Before(b.(*commitAndPaths).commit.CommitTime()) {
+		if a.(*commitAndPaths).commit.Committer.When.Before(b.(*commitAndPaths).commit.Committer.When) {
 			return 1
 		}
 		return -1

modules/git/tree.go

@@ -110,7 +110,7 @@ func (t *Tree) ListEntriesRecursive() (Entries, error) {
 		}
 
 		convertedEntry := &TreeEntry{
-			ID:             SHA1(entry.Hash),
+			ID:             entry.Hash,
 			gogitTreeEntry: &entry,
 			ptree:          t,
 		}

modules/git/tree_entry.go

@@ -50,7 +50,7 @@ func (te *TreeEntry) Name() string {
 
 // Mode returns the mode of the entry
 func (te *TreeEntry) Mode() EntryMode {
-	return te.mode
+	return EntryMode(te.gogitTreeEntry.Mode)
 }
 
 // Size returns the size of the entry

routers/api/v1/repo/tree.go

@@ -128,11 +128,20 @@ func GetTreeBySHA(ctx *context.APIContext, sha string) *gitea.GitTreeResponse {
 	tree.Entries = make([]gitea.GitEntry, rangeEnd-rangeStart)
 	for e := rangeStart; e < rangeEnd; e++ {
 		i := e - rangeStart
-		tree.Entries[i].Path = entries[e].Name()
-		tree.Entries[i].Mode = fmt.Sprintf("%06x", entries[e].Mode())
-		tree.Entries[i].Type = string(entries[e].Type)
-		tree.Entries[i].Size = entries[e].Size()
-		tree.Entries[i].SHA = entries[e].ID.String()
+
+		tree.Entries[e].Path = entries[e].Name()
+		tree.Entries[e].Mode = fmt.Sprintf("%06x", entries[e].Mode())
+
+		if entries[e].Mode() == git.EntryModeCommit {
+			tree.Entries[e].Type = "commit"
+		} else if entries[e].Mode() == git.EntryModeTree {
+			tree.Entries[e].Type = "tree"
+		} else {
+			tree.Entries[e].Type = "blob"
+		}
+
+		tree.Entries[e].Size = entries[e].Size()
+		tree.Entries[e].SHA = entries[e].ID.String()
 
 		if entries[e].IsDir() {
 			copy(treeURL[copyPos:], entries[e].ID.String())