Skip to content

Commit 6479c52

Browse files
committed
Use sync waiting status for cherry-picking
This reduces flicker of the Files panel in the case that an auto-stash needs to be made.
1 parent 3f3e942 commit 6479c52

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

pkg/gui/controllers/helpers/cherry_pick_helper.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package helpers
33
import (
44
"strconv"
55

6-
"github.com/jesseduffield/gocui"
76
"github.com/jesseduffield/lazygit/pkg/commands/models"
87
"github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking"
98
"github.com/jesseduffield/lazygit/pkg/gui/types"
@@ -77,7 +76,7 @@ func (self *CherryPickHelper) Paste() error {
7776
"numCommits": strconv.Itoa(len(self.getData().CherryPickedCommits)),
7877
}),
7978
HandleConfirm: func() error {
80-
return self.c.WithWaitingStatus(self.c.Tr.CherryPickingStatus, func(gocui.Task) error {
79+
return self.c.WithWaitingStatusSync(self.c.Tr.CherryPickingStatus, func() error {
8180
mustStash := IsWorkingTreeDirty(self.c.Model().Files)
8281

8382
self.c.LogAction(self.c.Tr.Actions.CherryPick)

0 commit comments

Comments
 (0)