From d9aceaf0daa2449516543b35c9f1a11aded7a954 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 10 May 2026 15:40:09 +0200 Subject: [PATCH 1/2] Keep GitHub PR refresh error logging in one place --- pkg/gui/controllers/helpers/refresh_helper.go | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 6c554deff70..3e0d15bcd25 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -831,9 +831,7 @@ func (self *RefreshHelper) refreshGithubPullRequests() { return } - if err := self.setGithubPullRequests(baseInfo); err != nil { - self.c.LogAction(fmt.Sprintf("Error fetching pull requests from GitHub: %s", err.Error())) - } + self.setGithubPullRequests(baseInfo) } type githubRemoteInfo struct { @@ -914,9 +912,7 @@ func (self *RefreshHelper) promptForBaseGithubRepo(githubRemotes []githubRemoteI self.c.Log.Error(err) } - if err := self.setGithubPullRequests(&info); err != nil { - self.c.LogAction(fmt.Sprintf("Error fetching pull requests from GitHub: %s", err.Error())) - } + self.setGithubPullRequests(&info) return nil }) }, @@ -944,9 +940,9 @@ func (self *RefreshHelper) rebuildPullRequestsMap() { ) } -func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo) error { +func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo) { if len(self.c.Model().Branches) == 0 { - return nil + return } branches := lo.Filter(self.c.Model().Branches, func(branch *models.Branch, _ int) bool { @@ -958,7 +954,8 @@ func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo) err prs, err := self.c.Git().GitHub.FetchRecentPRs(branchNames, &baseInfo.serviceInfo, baseInfo.authToken) if err != nil { - return err + self.c.LogAction(fmt.Sprintf("Error fetching pull requests from GitHub: %s", err.Error())) + return } self.c.Model().PullRequests = prs @@ -969,8 +966,6 @@ func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo) err self.c.PostRefreshUpdate(self.c.Contexts().Branches) return nil }) - - return nil } func (self *RefreshHelper) savePullRequestsToCache(prs []*models.GithubPullRequest) { From 58abf24862dd64f42887fa502d40622c0076126f Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Sun, 10 May 2026 15:43:40 +0200 Subject: [PATCH 2/2] Log errors from fetching GitHub PRs to the debug log, not to the Command Log In the Command Log we only want to see errors for user-initiated actions, not from background activity. --- pkg/gui/controllers/helpers/refresh_helper.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/gui/controllers/helpers/refresh_helper.go b/pkg/gui/controllers/helpers/refresh_helper.go index 3e0d15bcd25..2922b44037d 100644 --- a/pkg/gui/controllers/helpers/refresh_helper.go +++ b/pkg/gui/controllers/helpers/refresh_helper.go @@ -1,7 +1,6 @@ package helpers import ( - "fmt" "strings" "sync" "time" @@ -954,7 +953,7 @@ func (self *RefreshHelper) setGithubPullRequests(baseInfo *githubRemoteInfo) { prs, err := self.c.Git().GitHub.FetchRecentPRs(branchNames, &baseInfo.serviceInfo, baseInfo.authToken) if err != nil { - self.c.LogAction(fmt.Sprintf("Error fetching pull requests from GitHub: %s", err.Error())) + self.c.Log.Error("error fetching pull requests from GitHub: " + err.Error()) return }