diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-22 11:57:44 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | 442f6cd854d972c3797ca203c8de6943fe81d2ca (patch) | |
| tree | bd4b60dce12233f2bc15111efd7c473b58005b39 /pkg/gui/list_context.go | |
| parent | c2b154acad4e1040bdc0e09cf44733ccd877923b (diff) | |
more cherry picking stuff, mostly around the reflog
Diffstat (limited to 'pkg/gui/list_context.go')
| -rw-r--r-- | pkg/gui/list_context.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/list_context.go b/pkg/gui/list_context.go index f97af7675..199f0b5bb 100644 --- a/pkg/gui/list_context.go +++ b/pkg/gui/list_context.go @@ -367,7 +367,7 @@ func (gui *Gui) branchCommitsListContext() *ListContext { RendersToMainView: true, Kind: SIDE_CONTEXT, GetDisplayStrings: func() [][]string { - return presentation.GetCommitListDisplayStrings(gui.State.Commits, gui.State.ScreenMode != SCREEN_NORMAL, gui.CherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) + return presentation.GetCommitListDisplayStrings(gui.State.Commits, gui.State.ScreenMode != SCREEN_NORMAL, gui.cherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) }, Contains: CONTAINS_FILES, SelectedItem: func() ListItem { return gui.getSelectedLocalCommit() }, @@ -385,7 +385,7 @@ func (gui *Gui) reflogCommitsListContext() *ListContext { RendersToMainView: true, Kind: SIDE_CONTEXT, GetDisplayStrings: func() [][]string { - return presentation.GetReflogCommitListDisplayStrings(gui.State.FilteredReflogCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.State.Modes.Diffing.Ref) + return presentation.GetReflogCommitListDisplayStrings(gui.State.FilteredReflogCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.cherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) }, Contains: CONTAINS_FILES, SelectedItem: func() ListItem { return gui.getSelectedReflogCommit() }, @@ -404,7 +404,7 @@ func (gui *Gui) subCommitsListContext() *ListContext { Kind: SIDE_CONTEXT, GetDisplayStrings: func() [][]string { gui.Log.Warn("getting display strings for sub commits") - return presentation.GetCommitListDisplayStrings(gui.State.SubCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.CherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) + return presentation.GetCommitListDisplayStrings(gui.State.SubCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.cherryPickedCommitShaMap(), gui.State.Modes.Diffing.Ref) }, Contains: CONTAINS_COMMITS, SelectedItem: func() ListItem { return gui.getSelectedSubCommit() }, |