From 45aa82926f944d50cbcf83b9e1af9177129856eb Mon Sep 17 00:00:00 2001
From: Stefan Haller <stefan@haller-berlin.de>
Date: Fri, 26 Apr 2024 11:20:16 +0200
Subject: WIP Correctly request force-pushing in triangular workflows

---
 pkg/gui/controllers/sync_controller.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
cgit v1.2.3