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

Rename Pushables/Pullables to AheadForPull/BehindForPull

Browse Source 
In preparation for adding AheadForPush/BehindForPush in the next commit.
This commit is contained in:
Stefan Haller
2024-05-17 20:14:45 +02:00
parent b91b40ba4d
commit 0aba686f97
9 changed files with 88 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,10 +87,10 @@ func (self *SyncController) branchCheckedOut(f func(*models.Branch) error) func(
}
func (self *SyncController) push(currentBranch *models.Branch) error {
// if we have pullables we'll ask if the user wants to force push
// if we are behind our upstream branch we'll ask if the user wants to force push
if currentBranch.IsTrackingRemote() {
opts := pushOpts{}
if currentBranch.HasCommitsToPull() {
if currentBranch.IsBehindForPull() {
return self.requestToForcePush(currentBranch, opts)
} else {
return self.pushAux(currentBranch, opts)