feat(status): Remove untracked file on discard (#66)

isacikgoz · Jan 20, 2023 · 7428a0a · 7428a0a
1 parent 59c83e3
commit 7428a0a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/cli/status.go b/cli/status.go
@@ -108,7 +108,7 @@ func (s *status) defineKeybindings() error {
 			Key:     '!',
 			Display: "!",
 			Desc:    "discard changes",
-			Handler: s.checkoutEntry,
+			Handler: s.discardEntry,
 		},
 		&prompt.KeyBinding{
 			Key:     'q',
@@ -192,12 +192,14 @@ func (s *status) resetAllEntries(item interface{}) error {
 	return s.runCommandWithArgs(args)
 }
 
-func (s *status) checkoutEntry(item interface{}) error {
+func (s *status) discardEntry(item interface{}) error {
 	entry := item.(*git.StatusEntry)
+	var args []string
 	if entry.EntryType == git.StatusEntryTypeUntracked {
-		return nil // you can't checkout untracked items
+		args = []string{"clean", "--force", entry.String()}
+	} else {
+		args = []string{"checkout", "--", entry.String()}
 	}
-	args := []string{"checkout", "--", entry.String()}
 	return s.runCommandWithArgs(args)
 }