diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 13:29:28 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-15 14:15:41 +1100 |
| commit | 8d8bdb948b089250c22f3ac4f549152a209dcdb2 (patch) | |
| tree | 3687ba082abe7322fe5c77c452b618c7b5e6e2e2 /pkg/gui/files_panel.go | |
| parent | cdcfeb396fda1e61dee9b6d88ab4659152a10948 (diff) | |
avoid deadlock in merge panel
Diffstat (limited to 'pkg/gui/files_panel.go')
| -rw-r--r-- | pkg/gui/files_panel.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 05bf8d4ed..d121c8275 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -54,7 +54,7 @@ func (gui *Gui) filesRenderToMain() error { } if node.File != nil && node.File.HasInlineMergeConflicts { - return gui.refreshMergePanelWithLock() + return gui.renderConflictsFromFilesPanel() } cmdObj := gui.Git.WorkingTree.WorktreeFileDiffCmdObj(node, false, !node.GetHasUnstagedChanges() && node.GetHasStagedChanges(), gui.State.IgnoreWhitespaceInDiffView) @@ -182,7 +182,7 @@ func (gui *Gui) enterFile(opts OnFocusOpts) error { } if file.HasInlineMergeConflicts { - return gui.handleSwitchToMerge() + return gui.switchToMerge() } if file.HasMergeConflicts { return gui.createErrorPanel(gui.Tr.FileStagingRequirements) @@ -201,7 +201,7 @@ func (gui *Gui) handleFilePress() error { file := node.File if file.HasInlineMergeConflicts { - return gui.handleSwitchToMerge() + return gui.switchToMerge() } if file.HasUnstagedChanges { @@ -880,16 +880,12 @@ func (gui *Gui) upstreamForBranchInConfig(branchName string) (string, string, er return "", "", nil } -func (gui *Gui) handleSwitchToMerge() error { +func (gui *Gui) switchToMerge() error { file := gui.getSelectedFile() if file == nil { return nil } - if !file.HasInlineMergeConflicts { - return gui.createErrorPanel(gui.Tr.FileNoMergeCons) - } - return gui.pushContext(gui.State.Contexts.Merging) } |