From 894485190bdecb59d672c731c14ad922c07f73ba Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Mon, 17 Jul 2023 09:13:16 +1000 Subject: [PATCH] Don't quit on error --- pkg/gui/controllers/helpers/worktree_helper.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/gui/controllers/helpers/worktree_helper.go b/pkg/gui/controllers/helpers/worktree_helper.go index f6b821780..bcf31a87e 100644 --- a/pkg/gui/controllers/helpers/worktree_helper.go +++ b/pkg/gui/controllers/helpers/worktree_helper.go @@ -4,7 +4,6 @@ import ( "errors" "fmt" "io/fs" - "log" "os" "strings" @@ -50,7 +49,8 @@ func (self *WorktreeHelper) GetMainWorktreeName() string { func (self *WorktreeHelper) IsCurrentWorktree(w *models.Worktree) bool { pwd, err := os.Getwd() if err != nil { - log.Fatalln(err.Error()) + self.c.Log.Errorf("failed to obtain current working directory: %w", err) + return false } return pwd == w.Path @@ -61,7 +61,8 @@ func (self *WorktreeHelper) IsWorktreePathMissing(w *models.Worktree) bool { if errors.Is(err, fs.ErrNotExist) { return true } - log.Fatalln(fmt.Errorf("failed to check if worktree path `%s` exists\n%w", w.Path, err).Error()) + self.c.Log.Errorf("failed to check if worktree path `%s` exists: %w", w.Path, err) + return false } return false }