diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 12:43:31 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-03-28 13:19:35 +1100 |
| commit | 0c0231c3e835ef93a7fe06a95c28bd00f1da6631 (patch) | |
| tree | 50bc70e0a508888b9c370e4cbb0fe82f72dfdc44 /pkg/gui/discard_changes_menu_panel.go | |
| parent | a9559a5c8738d6938f8750f0729f077e0842800e (diff) | |
autostash changes when pulling file into index
Diffstat (limited to 'pkg/gui/discard_changes_menu_panel.go')
| -rw-r--r-- | pkg/gui/discard_changes_menu_panel.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/gui/discard_changes_menu_panel.go b/pkg/gui/discard_changes_menu_panel.go index 46722e1e5..0f01ad964 100644 --- a/pkg/gui/discard_changes_menu_panel.go +++ b/pkg/gui/discard_changes_menu_panel.go @@ -18,7 +18,7 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error { displayString: gui.Tr.SLocalize("discardAllChanges"), onPress: func() error { if err := gui.GitCommand.DiscardAllFileChanges(file); err != nil { - return err + return gui.surfaceError(err) } return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}}) }, @@ -30,7 +30,7 @@ func (gui *Gui) handleCreateDiscardMenu(g *gocui.Gui, v *gocui.View) error { displayString: gui.Tr.SLocalize("discardUnstagedChanges"), onPress: func() error { if err := gui.GitCommand.DiscardUnstagedFileChanges(file); err != nil { - return err + return gui.surfaceError(err) } return gui.refreshSidePanels(refreshOptions{mode: ASYNC, scope: []int{FILES}}) |