more file tree improvements

2 files changed, 2 insertions, 28 deletions

diff --git a/pkg/commands/files.go b/pkg/commands/files.go
index e7332dbbe..8244408cc 100644
--- a/pkg/commands/files.go
+++ b/pkg/commands/files.go
@@ -142,16 +142,8 @@ func (c *GitCommand) DiscardAllFileChanges(file *models.File) error {
 }
 
 func (c *GitCommand) DiscardAllDirChanges(node *models.StatusLineNode) error {
-	if err := c.RemoveUntrackedDirFiles(node); err != nil {
-		return err
-	}
-
-	quotedPath := c.OSCommand.Quote(node.GetPath())
-	if err := c.OSCommand.RunCommand("git checkout HEAD -- %s", quotedPath); err != nil {
-		return err
-	}
-
-	return nil
+	// this could be more efficient but we would need to handle all the edge cases
+	return node.ForEachFile(c.DiscardAllFileChanges)
 }
 
 func (c *GitCommand) DiscardUnstagedDirChanges(node *models.StatusLineNode) error {
diff --git a/pkg/commands/models/status_line_node.go b/pkg/commands/models/status_line_node.go
index ce85cfec8..3962e0c42 100644
--- a/pkg/commands/models/status_line_node.go
+++ b/pkg/commands/models/status_line_node.go
@@ -13,24 +13,6 @@ type StatusLineNode struct {
 	Collapsed bool
 }
 
-func (s *StatusLineNode) GetShortStatus() string {
-	// need to see if any child has unstaged changes.
-	if s.IsLeaf() {
-		return s.File.ShortStatus
-	}
-
-	firstChar := " "
-	secondChar := " "
-	if s.GetHasStagedChanges() {
-		firstChar = "M"
-	}
-	if s.GetHasUnstagedChanges() {
-		secondChar = "M"
-	}
-
-	return firstChar + secondChar
-}
-
 func (s *StatusLineNode) GetHasUnstagedChanges() bool {
 	if s.IsLeaf() {
 		return s.File.HasUnstagedChanges