go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-15 00:15:32 +02:00
Code Issues Releases Activity

some more refactoring

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-30 20:03:08 +11:00
parent e2f5fe1016
commit 0a8cff6ab6
31 changed files with 647 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/gui/controllers/sync_controller.go
View File

@ -22,7 +22,7 @@ type SyncController struct {
getCheckedOutBranch func() *models.Branch
suggestionsHelper ISuggestionsHelper
getSuggestedRemote func() string
checkMergeOrRebase func(error) error
CheckMergeOrRebase func(error) error
}
var _ types.IController = &SyncController{}
@ -33,7 +33,7 @@ func NewSyncController(
getCheckedOutBranch func() *models.Branch,
suggestionsHelper ISuggestionsHelper,
getSuggestedRemote func() string,
checkMergeOrRebase func(error) error,
CheckMergeOrRebase func(error) error,
) *SyncController {
return &SyncController{
c: c,
@ -42,7 +42,7 @@ func NewSyncController(
getCheckedOutBranch: getCheckedOutBranch,
suggestionsHelper: suggestionsHelper,
getSuggestedRemote: getSuggestedRemote,
checkMergeOrRebase: checkMergeOrRebase,
CheckMergeOrRebase: CheckMergeOrRebase,
}
}
@ -191,7 +191,7 @@ func (self *SyncController) pullWithLock(opts PullFilesOptions) error {
},
)
return self.checkMergeOrRebase(err)
return self.CheckMergeOrRebase(err)
}
type pushOpts struct {