diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-02-06 15:54:26 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 722410aded4e3d14356c7ab94bfa15abe10359fa (patch) | |
| tree | 8e8a57503b0b57bccca5fa8cd146bc699960033f /pkg/gui/refresh.go | |
| parent | b93b8cc00a2f2ea339b1ecdbc380320556490d3b (diff) | |
refactor controllers
Diffstat (limited to 'pkg/gui/refresh.go')
| -rw-r--r-- | pkg/gui/refresh.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/gui/refresh.go b/pkg/gui/refresh.go index 84d58d815..215028609 100644 --- a/pkg/gui/refresh.go +++ b/pkg/gui/refresh.go @@ -215,7 +215,7 @@ func (gui *Gui) refreshCommitsWithLimit() error { FilterPath: gui.State.Modes.Filtering.GetPath(), IncludeRebaseCommits: true, RefName: gui.refForLog(), - All: gui.ShowWholeGitGraph, + All: gui.State.Contexts.BranchCommits.GetShowWholeGitGraph(), }, ) if err != nil { @@ -408,7 +408,7 @@ func (gui *Gui) refreshStateFiles() error { } if gui.git.Status.WorkingTreeState() != enums.REBASE_MODE_NONE && conflictFileCount == 0 && prevConflictFileCount > 0 { - gui.OnUIThread(func() error { return gui.helpers.Rebase.PromptToContinueRebase() }) + gui.OnUIThread(func() error { return gui.helpers.MergeAndRebase.PromptToContinueRebase() }) } fileTreeViewModel.RWMutex.Lock() @@ -526,7 +526,7 @@ func (gui *Gui) refreshStatus() { gui.Mutexes.RefreshingStatusMutex.Lock() defer gui.Mutexes.RefreshingStatusMutex.Unlock() - currentBranch := gui.getCheckedOutBranch() + currentBranch := gui.helpers.Refs.GetCheckedOutRef() if currentBranch == nil { // need to wait for branches to refresh return |