diff options
| -rw-r--r-- | pkg/gui/file_change_manager.go | 4 | ||||
| -rw-r--r-- | pkg/gui/status_tree.go | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkg/gui/file_change_manager.go b/pkg/gui/file_change_manager.go index 40f547666..1af1fb748 100644 --- a/pkg/gui/file_change_manager.go +++ b/pkg/gui/file_change_manager.go @@ -63,9 +63,9 @@ func (m *FileChangeManager) SetFiles(files []*models.File) { func (m *FileChangeManager) SetTree() { if m.ShowTree { - m.Tree = GetTreeFromStatusFiles(m.Files) + m.Tree = GetTreeFromFiles(m.Files) } else { - m.Tree = GetFlatTreeFromStatusFiles(m.Files) + m.Tree = GetFlatTreeFromFiles(m.Files) } } diff --git a/pkg/gui/status_tree.go b/pkg/gui/status_tree.go index abf301e03..3e201b7d4 100644 --- a/pkg/gui/status_tree.go +++ b/pkg/gui/status_tree.go @@ -9,7 +9,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/commands/models" ) -func GetTreeFromStatusFiles(files []*models.File) *models.FileChangeNode { +func GetTreeFromFiles(files []*models.File) *models.FileChangeNode { root := &models.FileChangeNode{} var curr *models.FileChangeNode @@ -49,8 +49,8 @@ func GetTreeFromStatusFiles(files []*models.File) *models.FileChangeNode { return root } -func GetFlatTreeFromStatusFiles(files []*models.File) *models.FileChangeNode { - rootAux := GetTreeFromStatusFiles(files) +func GetFlatTreeFromFiles(files []*models.File) *models.FileChangeNode { + rootAux := GetTreeFromFiles(files) sortedFiles := rootAux.GetLeaves() // Move merge conflicts to top. This is the one way in which sorting |