fix test

go-gitea · wxiaoguang · Jun 30, 2025 · Jan 16, 2024 · Jan 17, 2024 · Jan 17, 2024
commit 4a64b6938b3dd4275f8f82bcddf3fa79be9cf53a
diff --git a/modules/git/commit.go b/modules/git/commit.go
@@ -20,7 +20,8 @@ import (
 
 // Commit represents a git commit.
 type Commit struct {
-	Tree
+	Tree // FIXME: bad design, this field can be nil if the commit is from "last commit cache"
+
 	ID            ObjectID // The ID of this commit object
 	Author        *Signature
 	Committer     *Signature

diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
@@ -254,12 +254,12 @@ func LastCommit(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplRepoViewList)
 }
 
-func prepareDirectoryFileIcons(ctx *context.Context, parentDir string, files []git.CommitInfo) {
+func prepareDirectoryFileIcons(ctx *context.Context, files []git.CommitInfo) {
 	renderedIconPool := fileicon.NewRenderedIconPool()
 	fileIcons := map[string]template.HTML{}
 	for _, f := range files {
-		fullPath := path.Join(parentDir, f.Entry.Name())
-		entryInfo := fileicon.EntryInfoFromGitTreeEntry(f.Commit, fullPath, f.Entry)
+		fullPath := path.Join(ctx.Repo.TreePath, f.Entry.Name())
+		entryInfo := fileicon.EntryInfoFromGitTreeEntry(ctx.Repo.Commit, fullPath, f.Entry)
 		fileIcons[f.Entry.Name()] = fileicon.RenderEntryIconHTML(renderedIconPool, entryInfo)
 	}
 	fileIcons[".."] = fileicon.RenderEntryIconHTML(renderedIconPool, fileicon.EntryInfoFolder())
@@ -308,7 +308,7 @@ func renderDirectoryFiles(ctx *context.Context, timeout time.Duration) git.Entri
 		return nil
 	}
 	ctx.Data["Files"] = files
-	prepareDirectoryFileIcons(ctx, ctx.Repo.TreePath, files)
+	prepareDirectoryFileIcons(ctx, files)
 	for _, f := range files {
 		if f.Commit == nil {
 			ctx.Data["HasFilesWithoutLatestCommit"] = true