summaryrefslogtreecommitdiffstats
path: root/pkg/gui/reset_menu_panel.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-02-16 09:32:51 +1100
committerJesse Duffield <jessedduffield@gmail.com>2020-02-16 09:57:49 +1100
commit0a69c1a02d2981a45f79fa65f785ef962be566aa (patch)
treefdf861368597ff9908fea0864070a9d51476142b /pkg/gui/reset_menu_panel.go
parentfeaf98bd018502ca95c0d93be0d8b2bfa7f46f03 (diff)
add reset to reflog commit menu
Diffstat (limited to 'pkg/gui/reset_menu_panel.go')
-rw-r--r--pkg/gui/reset_menu_panel.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/pkg/gui/reset_menu_panel.go b/pkg/gui/reset_menu_panel.go
index 10f2705dc..44c33e035 100644
--- a/pkg/gui/reset_menu_panel.go
+++ b/pkg/gui/reset_menu_panel.go
@@ -20,9 +20,13 @@ func (gui *Gui) createResetMenu(ref string) error {
},
onPress: func() error {
if err := gui.GitCommand.ResetToCommit(ref, innerStrength); err != nil {
- return err
+ return gui.createErrorPanel(gui.g, err.Error())
}
+ gui.switchCommitsPanelContext("branch-commits")
+ gui.State.Panels.Commits.SelectedLine = 0
+ gui.State.Panels.ReflogCommits.SelectedLine = 0
+
if err := gui.refreshCommits(gui.g); err != nil {
return err
}
@@ -33,7 +37,6 @@ func (gui *Gui) createResetMenu(ref string) error {
return err
}
- gui.State.Panels.Commits.SelectedLine = 0
return gui.handleCommitSelect(gui.g, gui.getCommitsView())
},
}