diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-04-26 11:20:16 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-04-26 11:20:16 +0200 |
| commit | 45aa82926f944d50cbcf83b9e1af9177129856eb (patch) | |
| tree | fc481284ac5c41bc6f1f4f63a20f6eea39e4a4ab | |
| parent | 45ebb14e555ea85134df321438485a43a2799b1a (diff) | |
WIP Correctly request force-pushing in triangular workflowssupport-triangular-workflow
| -rw-r--r-- | pkg/gui/controllers/sync_controller.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/gui/controllers/sync_controller.go b/pkg/gui/controllers/sync_controller.go index 403f31d94..45b84680e 100644 --- a/pkg/gui/controllers/sync_controller.go +++ b/pkg/gui/controllers/sync_controller.go @@ -90,7 +90,7 @@ func (self *SyncController) push(currentBranch *models.Branch) error { // if we have pullables we'll ask if the user wants to force push if currentBranch.IsTrackingRemote() { opts := pushOpts{} - if currentBranch.HasCommitsToPull() { + if currentBranch.Pullables2 != "?" && currentBranch.Pullables2 != "0" { return self.requestToForcePush(currentBranch, opts) } else { return self.pushAux(currentBranch, opts) |