Skip to content

Commit 50b8c44

Browse files
committed
fix
1 parent d9a23e9 commit 50b8c44

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

services/gitdiff/gitdiff.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,8 @@ func buildTree(files []*DiffFile) []*FileTreeNode {
14331433
if len(node.Children) > 0 {
14341434
mergedNode := mergeSingleChildDirs(node)
14351435
roots = append(roots, mergedNode)
1436+
} else {
1437+
roots = append(roots, node)
14361438
}
14371439
}
14381440
return roots
@@ -1446,13 +1448,10 @@ func mergeSingleChildDirs(node *FileTreeNode) *FileTreeNode {
14461448
IsFile: node.Children[0].IsFile,
14471449
File: node.Children[0].File,
14481450
}
1449-
if merged.File != nil {
1450-
merged.IsFile = true
1451-
}
1452-
return merged
1451+
return mergeSingleChildDirs(merged)
14531452
}
1454-
for _, child := range node.Children {
1455-
mergeSingleChildDirs(child)
1453+
for i, child := range node.Children {
1454+
node.Children[i] = mergeSingleChildDirs(child)
14561455
}
14571456
return node
14581457
}

0 commit comments

Comments
 (0)