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/commit_files_panel.go | |
| parent | b93b8cc00a2f2ea339b1ecdbc380320556490d3b (diff) | |
refactor controllers
Diffstat (limited to 'pkg/gui/commit_files_panel.go')
| -rw-r--r-- | pkg/gui/commit_files_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/commit_files_panel.go b/pkg/gui/commit_files_panel.go index fbbedcb6f..8f1201ccb 100644 --- a/pkg/gui/commit_files_panel.go +++ b/pkg/gui/commit_files_panel.go @@ -85,7 +85,7 @@ func (gui *Gui) handleDiscardOldFileChange() error { return gui.c.WithWaitingStatus(gui.c.Tr.RebasingStatus, func() error { gui.c.LogAction(gui.c.Tr.Actions.DiscardOldFileChange) if err := gui.git.Rebase.DiscardOldFileChanges(gui.State.Model.Commits, gui.State.Contexts.BranchCommits.GetSelectedLineIdx(), fileName); err != nil { - if err := gui.helpers.Rebase.CheckMergeOrRebase(err); err != nil { + if err := gui.helpers.MergeAndRebase.CheckMergeOrRebase(err); err != nil { return err } } @@ -265,7 +265,7 @@ func (gui *Gui) SwitchToCommitFilesContext(opts controllers.SwitchToCommitFilesC gui.State.Contexts.CommitFiles.SetRefName(opts.RefName) gui.State.Contexts.CommitFiles.SetCanRebase(opts.CanRebase) gui.State.Contexts.CommitFiles.SetParentContext(opts.Context) - gui.State.Contexts.CommitFiles.SetWindowName(opts.WindowName) + gui.State.Contexts.CommitFiles.SetWindowName(opts.Context.GetWindowName()) if err := gui.refreshCommitFilesView(); err != nil { return err |