Merge pull request #45 from Hi7cl4w/fix/14-diffy-no-changes-on-repo-with-submodules

fix: Handle git repositories with submodules correctly

Author: Hi7cl4w

src/service/GitService.ts

@@ -176,34 +176,57 @@ class GitService {
 
   /**
    * Get the diff in the git repository.
+   * Handles submodules correctly by using simple-git with safe configuration.
    * @returns The diff object is being returned.
    */
   async getGitDiff(repo: Repository, _cachedInput = true, nameOnly?: boolean) {
-    // let diff = await repo.diff(cached);
-    const git = simpleGit(repo.rootUri.fsPath);
+    // Configure simple-git for proper submodule handling
+    const git = simpleGit(repo.rootUri.fsPath, {
+      binary: "git",
+      maxConcurrentProcesses: 6,
+    });
+
     let diff: string | null = "";
 
     // Get exclusion patterns from settings
     const excludePatterns = WorkspaceService.getInstance().getExcludeFilesFromDiff();
 
-    if (!nameOnly) {
-      diff = await git.diff(["--cached"]).catch((error) => {
-        this.showErrorMessage("git repository not found");
-        console.error(error);
+    try {
+      // Check if we're in a valid git repository (handles submodules)
+      const isRepo = await git.checkIsRepo();
+      if (!isRepo) {
+        this.showErrorMessage("Not a git repository");
         return null;
-      });
+      }
 
-      // Apply file filtering if diff was successful
-      if (diff && excludePatterns.length > 0) {
-        diff = this.filterDiffByExclusions(diff, excludePatterns);
+      if (!nameOnly) {
+        diff = await git.diff(["--cached"]);
+
+        // Apply file filtering if diff was successful
+        if (diff && excludePatterns.length > 0) {
+          diff = this.filterDiffByExclusions(diff, excludePatterns);
+        }
+      } else {
+        diff = await git.diff(["--cached", "--name-status"]);
       }
-    } else {
-      diff = await git.diff(["--cached", "--name-status"]).catch((error) => {
-        this.showErrorMessage("git repository not found");
-        console.error(error);
-        return null;
-      });
+    } catch (error) {
+      // Handle specific git errors
+      if (error && typeof error === "object" && "message" in error) {
+        const errorMessage = (error as Error).message;
+        if (errorMessage.includes("not a git repository")) {
+          this.showErrorMessage("Not a git repository");
+        } else if (errorMessage.includes("submodule")) {
+          this.showErrorMessage("Submodule error - ensure submodules are initialized");
+        } else {
+          this.showErrorMessage("Git operation failed");
+        }
+      } else {
+        this.showErrorMessage("Git operation failed");
+      }
+      console.error("Git diff error:", error);
+      return null;
     }
+
     return diff;
   }
 

src/service/VsCodeLlmService.ts

@@ -137,21 +137,15 @@ ${customInstructions ? `\nADDITIONAL INSTRUCTIONS:\n${customInstructions}\n` : "
 
 Return ONLY the commit message, no explanations or surrounding text.`;
     }
+    const response = await this.getFromVsCodeLlm(instructions, code, progress);
 
-    try {
-      const response = await this.getFromVsCodeLlm(instructions, code, progress);
-
-      if (response) {
-        let message = response.trim();
-        message = message.replace(/^"/gm, "");
-        message = message.replace(/"$/gm, "");
-        return message;
-      }
-      return null;
-    } catch (error) {
-      // Re-throw the error so it can be caught by the calling function
-      throw error;
+    if (response) {
+      let message = response.trim();
+      message = message.replace(/^"/gm, "");
+      message = message.replace(/"$/gm, "");
+      return message;
     }
+    return null;
   }
 
   /**
@@ -163,22 +157,15 @@ Return ONLY the commit message, no explanations or surrounding text.`;
   async getExplainedChanges(_string1: string, string2: string): Promise<string | null> {
     const instructions =
       "You are a bot that explains the changes from the result of 'git diff --cached' that user given. commit message should be a multiple lines where first line doesn't exceed '50' characters by following commit message guidelines based on the given git diff changes without mentioning itself";
+    const response = await this.getFromVsCodeLlm(instructions, string2);
 
-    // Use string2 as the code/diff, string1 is typically instructions but we use our own
-    try {
-      const response = await this.getFromVsCodeLlm(instructions, string2);
-
-      if (response) {
-        let message = response.trim();
-        message = message.replace(/^"/gm, "");
-        message = message.replace(/"$/gm, "");
-        return message;
-      }
-      return null;
-    } catch (error) {
-      // Re-throw the error so it can be caught by the calling function
-      throw error;
+    if (response) {
+      let message = response.trim();
+      message = message.replace(/^"/gm, "");
+      message = message.replace(/"$/gm, "");
+      return message;
     }
+    return null;
   }
 
   /**