diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-09 11:34:10 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-09 12:23:13 +1100 |
| commit | e47ad846c4b6100aaff7013a3516d329bde19194 (patch) | |
| tree | ead7f3f0a911d7ee4f4f46640c2bf449a74e8e05 /pkg/gui/merge_panel.go | |
| parent | 8f68ac21293f1a0476802974817d9f87875f8743 (diff) | |
big golangci-lint cleanup
Diffstat (limited to 'pkg/gui/merge_panel.go')
| -rw-r--r-- | pkg/gui/merge_panel.go | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkg/gui/merge_panel.go b/pkg/gui/merge_panel.go index 5e6272f38..89e83b2d9 100644 --- a/pkg/gui/merge_panel.go +++ b/pkg/gui/merge_panel.go @@ -151,13 +151,19 @@ func (gui *Gui) handlePopFileSnapshot(g *gocui.Gui, v *gocui.View) error { if err != nil { return err } - ioutil.WriteFile(gitFile.Name, []byte(prevContent), 0644) + if err := ioutil.WriteFile(gitFile.Name, []byte(prevContent), 0644); err != nil { + return err + } + return gui.refreshMergePanel() } func (gui *Gui) handlePickHunk(g *gocui.Gui, v *gocui.View) error { conflict := gui.State.Panels.Merging.Conflicts[gui.State.Panels.Merging.ConflictIndex] - gui.pushFileSnapshot(g) + if err := gui.pushFileSnapshot(g); err != nil { + return err + } + pick := "bottom" if gui.State.Panels.Merging.ConflictTop { pick = "top" @@ -178,7 +184,9 @@ func (gui *Gui) handlePickHunk(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handlePickBothHunks(g *gocui.Gui, v *gocui.View) error { conflict := gui.State.Panels.Merging.Conflicts[gui.State.Panels.Merging.ConflictIndex] - gui.pushFileSnapshot(g) + if err := gui.pushFileSnapshot(g); err != nil { + return err + } err := gui.resolveConflict(g, conflict, "both") if err != nil { panic(err) @@ -215,9 +223,7 @@ func (gui *Gui) refreshMergePanel() error { mainView := gui.getMainView() mainView.Wrap = false - if err := gui.setViewContent(gui.g, mainView, content); err != nil { - return err - } + gui.setViewContent(gui.g, mainView, content) gui.Log.Warn("scrolling to conflict") if err := gui.scrollToConflict(gui.g); err != nil { return err |