Exit cleanly when worktree/repository is removed while lazygit is running

pkg/app/errors.go

@@ -27,6 +27,10 @@ func knownError(tr *i18n.TranslationSet, err error) (string, bool) {
 			originalError: "fatal: not a git repository",
 			newError:      tr.NotARepository,
 		},
+		{
+			originalError: "fatal: Unable to read current working directory",
+			newError:      tr.WorkingDirectoryDoesNotExist,
+		},
 		{
 			originalError: "getwd: no such file or directory",
 			newError:      tr.WorkingDirectoryDoesNotExist,

pkg/commands/git_commands/branch_loader.go

@@ -72,7 +72,10 @@ func (self *BranchLoader) Load(reflogCommits []*models.Commit,
 	onWorker func(func() error),
 	renderFunc func(),
 ) ([]*models.Branch, error) {
-	branches := self.obtainBranches()
+	branches, err := self.obtainBranches()
+	if err != nil {
+		return nil, err
+	}
 
 	if self.UserConfig().Git.LocalBranchSortOrder == "recency" {
 		reflogBranches := self.obtainReflogBranches(reflogCommits)
@@ -232,10 +235,10 @@ func (self *BranchLoader) GetBaseBranch(branch *models.Branch, mainBranches *Mai
 	return split[0], nil
 }
 
-func (self *BranchLoader) obtainBranches() []*models.Branch {
+func (self *BranchLoader) obtainBranches() ([]*models.Branch, error) {
 	output, err := self.getRawBranches()
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	trimmedOutput := strings.TrimSpace(output)
@@ -256,7 +259,7 @@ func (self *BranchLoader) obtainBranches() []*models.Branch {
 
 		storeCommitDateAsRecency := self.UserConfig().Git.LocalBranchSortOrder != "recency"
 		return obtainBranch(split, storeCommitDateAsRecency), true
-	})
+	}), nil
 }
 
 func (self *BranchLoader) getRawBranches() (string, error) {

pkg/gui/controllers/helpers/refresh_helper.go

@@ -471,7 +471,10 @@ func (self *RefreshHelper) refreshBranches(refreshWorktrees bool, keepBranchSele
 			})
 		})
 	if err != nil {
-		self.c.Log.Error(err)
+		self.c.OnUIThread(func() error {
+			return types.ErrFatal{Err: err}
+		})
+		return
 	}
 
 	prevSelectedBranch := self.c.Contexts().Branches.GetSelected()

pkg/gui/popup/popup_handler.go

@@ -81,6 +81,11 @@ func (self *PopupHandler) WithWaitingStatusSync(message string, f func() error)
 }
 
 func (self *PopupHandler) ErrorHandler(err error) error {
+	var fatalError types.ErrFatal
+	if errors.As(err, &fatalError) {
+		return err
+	}
+
 	var notHandledError *types.ErrKeybindingNotHandled
 	if errors.As(err, &notHandledError) {
 		if !notHandledError.DisabledReason.ShowErrorInPanel {

pkg/gui/types/keybindings.go

@@ -92,3 +92,17 @@ func (e ErrKeybindingNotHandled) Error() string {
 func (e ErrKeybindingNotHandled) Unwrap() error {
 	return gocui.ErrKeybindingNotHandled
 }
+
+// ErrFatal is an error that should cause the program to exit immediately,
+// bypassing the popup error handler.
+type ErrFatal struct {
+	Err error
+}
+
+func (e ErrFatal) Error() string {
+	return e.Err.Error()
+}
+
+func (e ErrFatal) Unwrap() error {
+	return e.Err
+}