ignore some errors that breaks the mainloop unnecessarily

isacikgoz · Jun 21, 2019 · 1a98e23 · 1a98e23
1 parent a93f0c3
commit 1a98e23
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cli/status.go b/cli/status.go
@@ -156,11 +156,13 @@ func (s *status) hunkStageEntry(item interface{}) error {
 }
 
 func (s *status) commit(item interface{}) error {
-	return s.bareCommit("--edit")
+	s.bareCommit("--edit") // why ignore err? simply to return status screen
+	return nil
 }
 
 func (s *status) amend(item interface{}) error {
-	return s.bareCommit("--amend")
+	s.bareCommit("--amend")
+	return nil
 }
 
 func (s *status) bareCommit(arg string) error {
@@ -192,6 +194,9 @@ func (s *status) resetAllEntries(item interface{}) error {
 
 func (s *status) checkoutEntry(item interface{}) error {
 	entry := item.(*git.StatusEntry)
+	if entry.EntryType == git.StatusEntryTypeUntracked {
+		return nil // you can't checkout untracked items
+	}
 	args := []string{"checkout", "--", entry.String()}
 	return s.runCommandWithArgs(args)
 }

diff --git a/prompt/prompt.go b/prompt/prompt.go
@@ -217,7 +217,7 @@ mainloop:
 			case term.Enter, term.NewLine:
 				items, idx := p.list.Items()
 				if idx == NotFound {
-					continue
+					break
 				}
 				if err = p.selectionHandler(items[idx]); err != nil {
 					break mainloop