From 07597a3d14cba1e2d7612b2b9e039f41893efb25 Mon Sep 17 00:00:00 2001
From: MrLYC <imyikong@gmail.com>
Date: Fri, 30 Jan 2026 00:26:18 +0800
Subject: [PATCH] fix(git): handle untracked files in collectDiffs for commit
 message generation

Amp-Thread-ID: https://ampcode.com/threads/T-019c0a87-5323-7098-bea3-a1fc7cd43c18
Co-authored-by: Amp <amp@ampcode.com>
---
 packages/web/server/lib/git-service.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/web/server/lib/git-service.js b/packages/web/server/lib/git-service.js
index 0b57abff..b1a8d70f 100644
--- a/packages/web/server/lib/git-service.js
+++ b/packages/web/server/lib/git-service.js
@@ -424,8 +424,15 @@ export async function getDiff(directory, { path, staged = false, contextLines =
         noIndexArgs.push(`-U${Math.max(0, contextLines)}`);
       }
       noIndexArgs.push('--no-index', '--', '/dev/null', path);
-      const noIndexDiff = await git.raw(noIndexArgs);
-      return noIndexDiff;
+      try {
+        const noIndexDiff = await git.raw(noIndexArgs);
+        return noIndexDiff;
+      } catch (noIndexError) {
+        if (noIndexError.message && noIndexError.message.includes('diff --git')) {
+          return noIndexError.message;
+        }
+        throw noIndexError;
+      }
     }
   } catch (error) {
     console.error('Failed to get Git diff:', error);