diff options
Diffstat (limited to 'pkg/gui/stagedview.go')
| -rw-r--r-- | pkg/gui/stagedview.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkg/gui/stagedview.go b/pkg/gui/stagedview.go index 4a6beb9..a1c9737 100644 --- a/pkg/gui/stagedview.go +++ b/pkg/gui/stagedview.go @@ -18,44 +18,43 @@ func (gui *Gui) openStageView(g *gocui.Gui) error { } v.Title = stageViewFeature.Title } - entity := gui.getSelectedRepository() - if err := refreshStagedView(g, entity); err != nil { + if err := refreshStagedView(g); err != nil { return err } return gui.focusToView(stageViewFeature.Name) } func (gui *Gui) resetChanges(g *gocui.Gui, v *gocui.View) error { - entity := gui.getSelectedRepository() + e := gui.getSelectedRepository() _, cy := v.Cursor() _, oy := v.Origin() if len(stagedFiles) <= 0 || len(stagedFiles) <= cy+oy { return nil } - if err := git.Reset(entity, stagedFiles[cy+oy], git.ResetOptions{}); err != nil { + if err := git.Reset(e, stagedFiles[cy+oy], git.ResetOptions{}); err != nil { return err } - return refreshAllStatusView(g, entity, true) + return refreshAllStatusView(g, e, true) } func (gui *Gui) resetAllChanges(g *gocui.Gui, v *gocui.View) error { - entity := gui.getSelectedRepository() - ref, err := entity.Repository.Head() + e := gui.getSelectedRepository() + ref, err := e.Repository.Head() if err != nil { return err } - if err := git.ResetAll(entity, git.ResetOptions{ + if err := git.ResetAll(e, git.ResetOptions{ Hash: ref.Hash().String(), Rtype: git.ResetMixed, }); err != nil { return err } - return refreshAllStatusView(g, entity, true) + return refreshAllStatusView(g, e, true) } // refresh the main view and re-render the repository representations -func refreshStagedView(g *gocui.Gui, entity *git.RepoEntity) error { +func refreshStagedView(g *gocui.Gui) error { stageView, err := g.View(stageViewFeature.Name) if err != nil { return err |