tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-23 13:55:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
Lunny Xiao 2025-01-05 23:17:40 -08:00
parent 91f972ce82
commit 96e050ec63
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
services/repository/files/tree.go
View File

@ -425,10 +425,15 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
} }
dir = treePath dir = treePath
if lastDirEntry.IsRegular() { if lastDirEntry.IsRegular() {
dir = path.Dir(treePath) // path.Dir cannot correctly handle .xxx file
lastDirEntry, err = commit.GetTreeEntryByPath(dir) dir, _ = path.Split(treePath)
if err != nil { if dir == "" {
return nil, err lastDirEntry = rootEntry
} else {
lastDirEntry, err = commit.GetTreeEntryByPath(dir)
if err != nil {
return nil, err
}
} }
} }
} }
@ -448,6 +453,7 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
} }
} }
sortTreeEntries(treeList)
if dir == "" || parentEntry == nil { if dir == "" || parentEntry == nil {
return treeList, nil return treeList, nil
} }
@ -475,7 +481,6 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
Path: path.Join(dir, entry.Name()), Path: path.Join(dir, entry.Name()),
}) })
} }
sortTreeEntries(treeList)
sortTreeEntries(parentEntry.Children) sortTreeEntries(parentEntry.Children)
return treeList, nil return treeList, nil
} }