Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 16:45:03 +02:00
Code Issues 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
if lastDirEntry.IsRegular() {
dir = path.Dir(treePath)
lastDirEntry, err = commit.GetTreeEntryByPath(dir)
if err != nil {
return nil, err
// path.Dir cannot correctly handle .xxx file
dir, _ = path.Split(treePath)
if dir == "" {
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 {
return treeList, nil
}
@ -475,7 +481,6 @@ func GetTreeInformation(ctx context.Context, repo *repo_model.Repository, treePa
Path: path.Join(dir, entry.Name()),
})
}
sortTreeEntries(treeList)
sortTreeEntries(parentEntry.Children)
return treeList, nil
}