From 088cf5a4bb322a9566382589c73634b6e778c81e Mon Sep 17 00:00:00 2001
From: Caleb Owens <hello@calebowens.com>
Date: Sat, 17 Feb 2024 12:17:56 +0000
Subject: [PATCH] Only show "Force push to remote" when pushing zero commits to
 a branch

---
 .../src/lib/components/CommitListFooter.svelte |  4 ++--
 .../src/lib/components/PushButton.svelte       | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gitbutler-ui/src/lib/components/CommitListFooter.svelte b/gitbutler-ui/src/lib/components/CommitListFooter.svelte
index e94505582..c46567af4 100644
--- a/gitbutler-ui/src/lib/components/CommitListFooter.svelte
+++ b/gitbutler-ui/src/lib/components/CommitListFooter.svelte
@@ -75,9 +75,9 @@
 			<PushButton
 				wide
 				isLoading={isPushing || $githubServiceState$?.busy}
-				isPushed={type == 'remote' && !branch.requiresForce}
-				requiresForcePush={branch.requiresForce}
 				isPr={!!$pr$}
+				{type}
+				{branch}
 				{projectId}
 				githubEnabled={$githubEnabled$}
 				on:trigger={async (e) => {
diff --git a/gitbutler-ui/src/lib/components/PushButton.svelte b/gitbutler-ui/src/lib/components/PushButton.svelte
index c9ffd75ef..4a5c3a8b1 100644
--- a/gitbutler-ui/src/lib/components/PushButton.svelte
+++ b/gitbutler-ui/src/lib/components/PushButton.svelte
@@ -8,6 +8,7 @@
 
 <script lang="ts">
 	import Button from '$lib/components/Button.svelte';
+	import type { Branch } from '$lib/vbranches/types';
 	import DropDownButton from '$lib/components/DropDownButton.svelte';
 	import ContextMenu from '$lib/components/contextmenu/ContextMenu.svelte';
 	import ContextMenuItem from '$lib/components/contextmenu/ContextMenuItem.svelte';
@@ -17,11 +18,11 @@
 	import { createEventDispatcher } from 'svelte';
 
 	export let projectId: string;
-	export let isPushed: boolean;
+	export let type: string;
 	export let isLoading = false;
 	export let githubEnabled: boolean;
 	export let wide = false;
-	export let requiresForcePush = false;
+	export let branch: Branch;
 	export let isPr = false;
 
 	function defaultAction(projectId: string): Persisted<BranchAction> {
@@ -37,7 +38,12 @@
 	let disabled = false;
 
 	$: selection$ = contextMenu?.selection$;
-	$: action = selectAction($preferredAction);
+
+    let action!: BranchAction;
+	$: {
+        isPushed; // selectAction is dependant on isPushed
+        action = selectAction($preferredAction);
+    }
 
 	function selectAction(preferredAction: BranchAction) {
 		if (isPushed && !githubEnabled) {
@@ -53,10 +59,12 @@
 		return preferredAction;
 	}
 
-	$: pushLabel = requiresForcePush ? 'Force push to remote' : 'Push to remote';
+	$: pushLabel = branch.requiresForce ? 'Force push to remote' : 'Push to remote';
+	$: commits = branch.commits.filter((c) => c.status == type);
+	$: isPushed = type === 'remote' && !branch.requiresForce;
 </script>
 
-{#if isPr && !isPushed}
+{#if (isPr || commits.length === 0) && !isPushed}
 	<Button
 		color="primary"
 		kind="outlined"