diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-04-26 11:20:16 +0200 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2024-05-19 09:44:38 +0200 |
| commit | c5cf1b2428c7fd23f63a9fb7fe9a5911dd2f004a (patch) | |
| tree | 0a905a5ba40ce4ec4c907ce8c6baf0361bb3ffc5 /pkg/gui | |
| parent | d890c68cd0a77d3b5bf8bf1c4a672f8b0a0bfbb4 (diff) | |
Correctly request force-pushing in triangular workflows
To determine whether we need to ask for force pushing, we need to query the push
branch rather than the upstream branch, in case they are not the same.
Diffstat (limited to 'pkg/gui')
| -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 8bd8dac9a..7d7ca9eed 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 are behind our upstream branch we'll ask if the user wants to force push if currentBranch.IsTrackingRemote() { opts := pushOpts{} - if currentBranch.IsBehindForPull() { + if currentBranch.IsBehindForPush() { return self.requestToForcePush(currentBranch, opts) } else { return self.pushAux(currentBranch, opts) |