Skip to content

Commit

Permalink
Fix crash when viewing the divergence of a branch which is up to date…
Browse files Browse the repository at this point in the history
… with its upstream

This was introduced by #3838, specifically by commit e675025.

Add a regression test that would have crashed without the fix.
  • Loading branch information
stefanhaller committed Sep 18, 2024
1 parent 4dadcd2 commit f8073c7
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/gui/context/list_renderer.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,10 @@ func (self *ListRenderer) insertNonModelItems(
break
}
if item.Index+offset >= startIdx {
padding := strings.Repeat(" ", columnPositions[item.Column])
padding := ""
if columnPositions != nil {
padding = strings.Repeat(" ", columnPositions[item.Column])
}
lines = slices.Insert(lines, item.Index+offset-startIdx, padding+item.Content)
}
offset++
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package branch

import (
"github.com/jesseduffield/lazygit/pkg/config"
. "github.com/jesseduffield/lazygit/pkg/integration/components"
)

var ShowDivergenceFromUpstreamNoDivergence = NewIntegrationTest(NewIntegrationTestArgs{
Description: "Show divergence from upstream when the divergence view is empty",
ExtraCmdArgs: []string{},
Skip: false,
SetupConfig: func(config *config.AppConfig) {},
SetupRepo: func(shell *Shell) {
shell.EmptyCommit("commit1")
shell.CloneIntoRemote("origin")
shell.SetBranchUpstream("master", "origin/master")
},
Run: func(t *TestDriver, keys config.KeybindingConfig) {
t.Views().Branches().
Focus().
Lines(Contains("master")).
Press(keys.Branches.SetUpstream)

t.ExpectPopup().Menu().Title(Contains("Upstream")).Select(Contains("View divergence from upstream")).Confirm()

t.Views().SubCommits().
IsFocused().
Title(Contains("Commits (master <-> origin/master)")).
Lines(
Contains("--- Remote ---"),
Contains("--- Local ---"),
)
},
})
1 change: 1 addition & 0 deletions pkg/integration/tests/test_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ var tests = []*components.IntegrationTest{
branch.SetUpstream,
branch.ShowDivergenceFromBaseBranch,
branch.ShowDivergenceFromUpstream,
branch.ShowDivergenceFromUpstreamNoDivergence,
branch.SortLocalBranches,
branch.SortRemoteBranches,
branch.SquashMerge,
Expand Down

0 comments on commit f8073c7

Please sign in to comment.