1
0
mirror of https://github.com/go-gitea/gitea synced 2025-02-25 00:09:18 +01:00
This commit is contained in:
Kerwin Bryant 2024-12-10 03:45:16 +00:00
parent d9a23e944e
commit 50b8c444ec

@ -1433,6 +1433,8 @@ func buildTree(files []*DiffFile) []*FileTreeNode {
if len(node.Children) > 0 { if len(node.Children) > 0 {
mergedNode := mergeSingleChildDirs(node) mergedNode := mergeSingleChildDirs(node)
roots = append(roots, mergedNode) roots = append(roots, mergedNode)
} else {
roots = append(roots, node)
} }
} }
return roots return roots
@ -1446,13 +1448,10 @@ func mergeSingleChildDirs(node *FileTreeNode) *FileTreeNode {
IsFile: node.Children[0].IsFile, IsFile: node.Children[0].IsFile,
File: node.Children[0].File, File: node.Children[0].File,
} }
if merged.File != nil { return mergeSingleChildDirs(merged)
merged.IsFile = true
}
return merged
} }
for _, child := range node.Children { for i, child := range node.Children {
mergeSingleChildDirs(child) node.Children[i] = mergeSingleChildDirs(child)
} }
return node return node
} }