diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-16 17:45:12 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-08-23 14:29:18 +1000 |
| commit | ed4574bda9f7f3b385f72cd5f7156d47bc28d0ea (patch) | |
| tree | bf2eda757c3eaf56660d4efa538e4653315e8ea1 /pkg/gui/staging_panel.go | |
| parent | c9ae54a8c8669483f8fbbb99ce4b139e204daa39 (diff) | |
standardise getting selected item
Diffstat (limited to 'pkg/gui/staging_panel.go')
| -rw-r--r-- | pkg/gui/staging_panel.go | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkg/gui/staging_panel.go b/pkg/gui/staging_panel.go index 5fc8fe9dc..47a63f40f 100644 --- a/pkg/gui/staging_panel.go +++ b/pkg/gui/staging_panel.go @@ -19,11 +19,8 @@ func (gui *Gui) refreshStagingPanel(forceSecondaryFocused bool, selectedLineIdx // return err // } - file, err := gui.getSelectedFile() - if err != nil { - if err != gui.Errors.ErrNoFiles { - return err - } + file := gui.getSelectedFile() + if file == nil { return gui.handleStagingEscape() } @@ -131,9 +128,9 @@ func (gui *Gui) handleResetSelection(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) applySelection(reverse bool) error { state := gui.State.Panels.LineByLine - file, err := gui.getSelectedFile() - if err != nil { - return err + file := gui.getSelectedFile() + if file == nil { + return nil } patch := patch.ModifiedPatchForRange(gui.Log, file.Name, state.Diff, state.FirstLineIdx, state.LastLineIdx, reverse, false) @@ -148,7 +145,7 @@ func (gui *Gui) applySelection(reverse bool) error { if !reverse || state.SecondaryFocused { applyFlags = append(applyFlags, "cached") } - err = gui.GitCommand.ApplyPatch(patch, applyFlags...) + err := gui.GitCommand.ApplyPatch(patch, applyFlags...) if err != nil { return gui.surfaceError(err) } |