Skip to content

Avoid crash when the git command to obtain branches fails #4547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Avoid crash when the git command to obtain branches fails #4547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions pkg/commands/git_commands/branch_loader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.AppState.LocalBranchSortOrder == "recency" {
reflogBranches := self.obtainReflogBranches(reflogCommits)
Expand Down Expand Up @@ -232,16 +235,16 @@ 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)
outputLines := strings.Split(trimmedOutput, "\n")

return lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
branches := lo.FilterMap(outputLines, func(line string, _ int) (*models.Branch, bool) {
if line == "" {
return nil, false
}
Expand All @@ -257,6 +260,7 @@ func (self *BranchLoader) obtainBranches() []*models.Branch {
storeCommitDateAsRecency := self.AppState.LocalBranchSortOrder != "recency"
return obtainBranch(split, storeCommitDateAsRecency), true
})
return branches, nil
}

func (self *BranchLoader) getRawBranches() (string, error) {
Expand Down
Loading