go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-06-20 01:19:23 +02:00
Code Issues Releases Activity

always refresh after stash action

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-24 19:18:09 +11:00
parent 88d685df53
commit 58bdcbf1dd
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/gui/stash_panel.go
+16 -8
View File
@@ -51,10 +51,12 @@ func (gui *Gui) handleStashApply() error {
apply := func() error { apply := func() error {
gui.logAction(gui.Tr.Actions.Stash) gui.logAction(gui.Tr.Actions.Stash)
if err := gui.Git.Stash.Apply(stashEntry.Index); err != nil { err := gui.Git.Stash.Apply(stashEntry.Index)
_ = gui.postStashRefresh()
if err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
return gui.postStashRefresh() return nil
} }
if skipStashWarning { if skipStashWarning {
@@ -80,10 +82,12 @@ func (gui *Gui) handleStashPop() error {
pop := func() error { pop := func() error {
gui.logAction(gui.Tr.Actions.Stash) gui.logAction(gui.Tr.Actions.Stash)
if err := gui.Git.Stash.Pop(stashEntry.Index); err != nil { err := gui.Git.Stash.Pop(stashEntry.Index)
_ = gui.postStashRefresh()
if err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
return gui.postStashRefresh() return nil
} }
if skipStashWarning { if skipStashWarning {
@@ -110,10 +114,12 @@ func (gui *Gui) handleStashDrop() error {
prompt: gui.Tr.SureDropStashEntry, prompt: gui.Tr.SureDropStashEntry,
handleConfirm: func() error { handleConfirm: func() error {
gui.logAction(gui.Tr.Actions.Stash) gui.logAction(gui.Tr.Actions.Stash)
if err := gui.Git.Stash.Drop(stashEntry.Index); err != nil { err := gui.Git.Stash.Drop(stashEntry.Index)
_ = gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{STASH}})
if err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
return gui.postStashRefresh() return nil
}, },
}) })
} }
@@ -130,10 +136,12 @@ func (gui *Gui) handleStashSave(stashFunc func(message string) error) error {
return gui.prompt(promptOpts{ return gui.prompt(promptOpts{
title: gui.Tr.StashChanges, title: gui.Tr.StashChanges,
handleConfirm: func(stashComment string) error { handleConfirm: func(stashComment string) error {
if err := stashFunc(stashComment); err != nil { err := stashFunc(stashComment)
_ = gui.postStashRefresh()
if err != nil {
return gui.surfaceError(err) return gui.surfaceError(err)
} }
return gui.refreshSidePanels(refreshOptions{scope: []RefreshableView{STASH, FILES}}) return nil
}, },
}) })
} }