utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 15:46:26 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove return value from PromptToContinueRebase

Browse source 
It always returned nil.
This commit is contained in:
Stefan Haller 2026-07-08 12:00:33 +02:00
parent 2765147b71
commit 36f193a2e8
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/gui/controllers/helpers/merge_and_rebase_helper.go
View file

@ -321,7 +321,7 @@ func (self *MergeAndRebaseHelper) AbortMergeOrRebaseWithConfirm() error {
}
// PromptToContinueRebase asks the user if they want to continue the rebase/merge that's in progress
func (self *MergeAndRebaseHelper) PromptToContinueRebase() error {
func (self *MergeAndRebaseHelper) PromptToContinueRebase() {
self.continueRebasePromptShowing = true
self.c.Confirm(types.ConfirmOpts{
Title: self.c.Tr.Continue,
@ -373,8 +373,6 @@ func (self *MergeAndRebaseHelper) PromptToContinueRebase() error {
return nil
},
})
return nil
}
// DismissContinueRebasePromptIfShowing closes the "continue the rebase/merge?"

3
pkg/gui/controllers/helpers/refresh_helper.go
View file

@ -1220,7 +1220,8 @@ func (self *RefreshHelper) refreshStateFiles(captured capturedFilesState, env re
self.mergeConflictsHelper.ResetMergeState()
self.c.Context().Push(self.c.Contexts().Files, types.OnFocusOpts{})
}
return self.mergeAndRebaseHelper.PromptToContinueRebase()
self.mergeAndRebaseHelper.PromptToContinueRebase()
return nil
})
}
} else {