summaryrefslogtreecommitdiffstats
path: root/pkg/gui/commits_panel.go
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/gui/commits_panel.go')
-rw-r--r--pkg/gui/commits_panel.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/pkg/gui/commits_panel.go b/pkg/gui/commits_panel.go
index f88557cdd..cd85dafd5 100644
--- a/pkg/gui/commits_panel.go
+++ b/pkg/gui/commits_panel.go
@@ -5,6 +5,7 @@ import (
"sync"
"github.com/jesseduffield/lazygit/pkg/commands"
+ "github.com/jesseduffield/lazygit/pkg/commands/loaders"
"github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/utils"
@@ -119,10 +120,10 @@ func (gui *Gui) refreshCommitsWithLimit() error {
gui.Mutexes.BranchCommitsMutex.Lock()
defer gui.Mutexes.BranchCommitsMutex.Unlock()
- builder := commands.NewCommitListBuilder(gui.Common, gui.GitCommand, gui.OSCommand)
+ loader := commands.NewCommitLoader(gui.Common, gui.GitCommand, gui.OSCommand)
- commits, err := builder.GetCommits(
- commands.GetCommitsOptions{
+ commits, err := loader.GetCommits(
+ loaders.GetCommitsOptions{
Limit: gui.State.Panels.Commits.LimitCommits,
FilterPath: gui.State.Modes.Filtering.GetPath(),
IncludeRebaseCommits: true,
@@ -142,9 +143,9 @@ func (gui *Gui) refreshRebaseCommits() error {
gui.Mutexes.BranchCommitsMutex.Lock()
defer gui.Mutexes.BranchCommitsMutex.Unlock()
- builder := commands.NewCommitListBuilder(gui.Common, gui.GitCommand, gui.OSCommand)
+ loader := commands.NewCommitLoader(gui.Common, gui.GitCommand, gui.OSCommand)
- updatedCommits, err := builder.MergeRebasingCommits(gui.State.Commits)
+ updatedCommits, err := loader.MergeRebasingCommits(gui.State.Commits)
if err != nil {
return err
}