From 6479c52fb2eb05a0cd633144fbbf27a360f15f0c Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Wed, 2 Jul 2025 18:19:15 +0200 Subject: [PATCH] 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. --- pkg/gui/controllers/helpers/cherry_pick_helper.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/gui/controllers/helpers/cherry_pick_helper.go b/pkg/gui/controllers/helpers/cherry_pick_helper.go index 3b9232340..f0e4993eb 100644 --- a/pkg/gui/controllers/helpers/cherry_pick_helper.go +++ b/pkg/gui/controllers/helpers/cherry_pick_helper.go @@ -3,7 +3,6 @@ package helpers import ( "strconv" - "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking" "github.com/jesseduffield/lazygit/pkg/gui/types" @@ -77,7 +76,7 @@ func (self *CherryPickHelper) Paste() error { "numCommits": strconv.Itoa(len(self.getData().CherryPickedCommits)), }), HandleConfirm: func() error { - return self.c.WithWaitingStatus(self.c.Tr.CherryPickingStatus, func(gocui.Task) error { + return self.c.WithWaitingStatusSync(self.c.Tr.CherryPickingStatus, func() error { mustStash := IsWorkingTreeDirty(self.c.Model().Files) self.c.LogAction(self.c.Tr.Actions.CherryPick)