From ca20945b93daa23c966125091618dbb7ecd93256 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Sun, 12 Apr 2026 14:52:41 +0700
Subject: [PATCH] Fix ahead-of-origin count for branches with no remote
 tracking branch

Fall back to counting all local commits when the origin comparison
fails, instead of returning null.
---
 packages/server/src/utils/checkout-git.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index c8ab0ab57..cddd79008 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -1005,7 +1005,16 @@ async function getAheadOfOrigin(cwd: string, currentBranch: string): Promise<num
     const count = Number.parseInt(stdout.trim(), 10);
     return Number.isNaN(count) ? null : count;
   } catch {
-    return null;
+    try {
+      const { stdout } = await execAsync(
+        `git rev-list --count ${currentBranch}`,
+        { cwd, env: READ_ONLY_GIT_ENV },
+      );
+      const count = Number.parseInt(stdout.trim(), 10);
+      return Number.isNaN(count) ? null : count;
+    } catch {
+      return null;
+    }
   }
 }