fix: guard against nil remote branch pointers in GetRemoteBranchListDisplayStrings#5601
Open
troclaux wants to merge 1 commit into
Open
fix: guard against nil remote branch pointers in GetRemoteBranchListDisplayStrings#5601troclaux wants to merge 1 commit into
troclaux wants to merge 1 commit into
Conversation
During concurrent remote refresh, stale nil pointers can appear in the branches slice, causing a panic in GetRemoteBranchListDisplayStrings when branch.FullName() is called. Skip nil entries with lo.FilterMap instead of lo.Map. Fixes jesseduffield#5370
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #5370.
During concurrent remote refresh, stale nil pointers can appear in the
branchesslice.GetRemoteBranchListDisplayStringscallsbranch.FullName()unconditionally, causing a nil pointer panic.Fix: switch from
lo.Maptolo.FilterMapand skip nil entries.Changes
pkg/gui/presentation/remote_branches.go: uselo.FilterMapto skip nil branch pointerspkg/gui/presentation/remote_branches_test.go: new test that passes a slice containing nil entries and asserts only non-nil branches produce display rowsTest plan
go test ./pkg/gui/presentation/...passesTestGetRemoteBranchListDisplayStrings_NilBranchconfirms nil entries are skipped without panic