From 2fd818c156e3b32da7735b116ad52c9318fbd3a7 Mon Sep 17 00:00:00 2001
From: Mohamed Boudra <boudra.moha@gmail.com>
Date: Wed, 4 Feb 2026 09:44:27 +0700
Subject: [PATCH] Update files

---
 packages/server/src/utils/checkout-git.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/utils/checkout-git.ts b/packages/server/src/utils/checkout-git.ts
index 8db383f24..4488b0c95 100644
--- a/packages/server/src/utils/checkout-git.ts
+++ b/packages/server/src/utils/checkout-git.ts
@@ -547,8 +547,14 @@ export async function getCheckoutDiff(
       throw new Error(`Base ref mismatch: expected ${baseRef}, got ${compare.baseRef}`);
     } else {
       const normalizedBaseRef = normalizeLocalBranchRefName(baseRef);
-      // Diff base ref against working tree (includes uncommitted changes)
-      const { stdout: trackedDiff } = await execAsync(`git diff ${normalizedBaseRef}`, {
+      // Find the merge-base (common ancestor) to diff only changes on this branch
+      const { stdout: mergeBaseOut } = await execAsync(
+        `git merge-base ${normalizedBaseRef} HEAD`,
+        { cwd, env: READ_ONLY_GIT_ENV }
+      );
+      const mergeBase = mergeBaseOut.trim();
+      // Diff from merge-base to working tree (includes uncommitted changes)
+      const { stdout: trackedDiff } = await execAsync(`git diff ${mergeBase}`, {
         cwd,
         env: READ_ONLY_GIT_ENV,
       });