From eb2bfd3848bc5178670380f77b675a27d94d2515 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Tue, 7 Jan 2020 20:12:36 +1100
Subject: allow hard resetting to upstream branch

---
 pkg/gui/files_panel.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'pkg/gui/files_panel.go')

diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go
index 463db817e..aa2e8592e 100644
--- a/pkg/gui/files_panel.go
+++ b/pkg/gui/files_panel.go
@@ -604,14 +604,21 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 			description: gui.Tr.SLocalize("softReset"),
 			command:     "git reset --soft HEAD",
 			handler: func() error {
-				return gui.GitCommand.ResetSoftHead()
+				return gui.GitCommand.ResetSoft("HEAD")
 			},
 		},
 		{
 			description: gui.Tr.SLocalize("hardReset"),
 			command:     "git reset --hard HEAD",
 			handler: func() error {
-				return gui.GitCommand.ResetHardHead()
+				return gui.GitCommand.ResetHard("HEAD")
+			},
+		},
+		{
+			description: gui.Tr.SLocalize("hardResetUpstream"),
+			command:     "git reset --hard @{upstream}",
+			handler: func() error {
+				return gui.GitCommand.ResetHard("@{upstream}")
 			},
 		},
 		{
@@ -624,7 +631,7 @@ func (gui *Gui) handleCreateResetMenu(g *gocui.Gui, v *gocui.View) error {
 
 	handleMenuPress := func(index int) error {
 		if err := options[index].handler(); err != nil {
-			return err
+			return gui.createErrorPanel(gui.g, err.Error())
 		}
 
 		return gui.refreshFiles()
-- 
cgit v1.2.3