diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-22 11:05:37 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | fbd61fcd17d495e9605bcf1f765663f861839cac (patch) | |
| tree | d5d9eaa12e3e5fbefa5c50282af8f8207d5bb6a3 /pkg/gui/sub_commits_panel.go | |
| parent | b1529f19ad527d29a469de09c11c37d7f61d8d16 (diff) | |
refactor how we handle different modes
Diffstat (limited to 'pkg/gui/sub_commits_panel.go')
| -rw-r--r-- | pkg/gui/sub_commits_panel.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/sub_commits_panel.go b/pkg/gui/sub_commits_panel.go index b892364e6..3ac5282d7 100644 --- a/pkg/gui/sub_commits_panel.go +++ b/pkg/gui/sub_commits_panel.go @@ -24,7 +24,7 @@ func (gui *Gui) handleSubCommitSelect() error { task = gui.createRenderStringTask("No commits") } else { cmd := gui.OSCommand.ExecutableFromString( - gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.FilterPath), + gui.GitCommand.ShowCmdStr(commit.Sha, gui.State.Modes.Filtering.Path), ) task = gui.createRunPtyTask(cmd) @@ -79,12 +79,12 @@ func (gui *Gui) handleViewSubCommitFiles() error { func (gui *Gui) switchToSubCommitsContext(refName string) error { // need to populate my sub commits - builder := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.CherryPickedCommits) + builder := commands.NewCommitListBuilder(gui.Log, gui.GitCommand, gui.OSCommand, gui.Tr, gui.State.Modes.CherryPicking.CherryPickedCommits) commits, err := builder.GetCommits( commands.GetCommitsOptions{ Limit: gui.State.Panels.Commits.LimitCommits, - FilterPath: gui.State.FilterPath, + FilterPath: gui.State.Modes.Filtering.Path, IncludeRebaseCommits: false, RefName: refName, }, |