MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-01-31 01:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Kerwin Bryant 2024-12-10 03:45:16 +00:00
parent d9a23e944e
commit 50b8c444ec
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/gitdiff/gitdiff.go
View File

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