@fern-api/replay 0.17.4 → 0.18.0

package/dist/index.cjs

@@ -62,6 +62,11 @@ var init_GitClient = __esm({
           proc.stderr.on("data", (data) => {
             stderr += data.toString();
           });
+          proc.on("error", (err) => {
+            reject(new Error(`git ${args.join(" ")} failed to spawn: ${err.message}`));
+          });
+          proc.stdin.on("error", () => {
+          });
           proc.on("close", (code) => {
             if (code === 0) {
               resolve2(stdout);
@@ -863,7 +868,8 @@ function isBinaryFile(filePath) {
 var INFRASTRUCTURE_FILES = /* @__PURE__ */ new Set([".fernignore"]);
 function matchesFernignorePattern(filePath, patterns) {
   if (patterns.length === 0) return false;
-  return patterns.some((p) => {
+  return patterns.some((rawPattern) => {
+    const p = rawPattern.endsWith("/") ? rawPattern.slice(0, -1) : rawPattern;
     if (filePath === p) return true;
     if ((0, import_minimatch2.minimatch)(filePath, p)) return true;
     if (!p.includes("*") && !p.includes("?") && filePath.startsWith(p + "/")) return true;
@@ -1042,20 +1048,15 @@ var ReplayDetector = class {
         continue;
       }
       const parents = await this.git.getCommitParents(commit.sha);
-      let patchContent;
+      let filesOutput;
       try {
-        patchContent = await this.git.formatPatch(commit.sha);
+        filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
       } catch {
         this.warnings.push(
           `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
         );
         continue;
       }
-      let contentHash = this.computeContentHash(patchContent);
-      if (lock.patches.find((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
-        continue;
-      }
-      const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
       const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
         filesOutput,
         this.fernignorePatterns
@@ -1070,19 +1071,31 @@ var ReplayDetector = class {
           `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
         );
       }
-      if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
-        const parentSha = parents[0];
-        if (parentSha) {
-          try {
-            patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
-          } catch {
-            continue;
-          }
-          if (!patchContent.trim()) continue;
-          contentHash = this.computeContentHash(patchContent);
+      if (files.length === 0) {
+        continue;
+      }
+      const wasFiltered = sensitiveFiles.length > 0 || fernignoredFiles.length > 0;
+      const parentSha = parents[0];
+      let patchContent;
+      if (wasFiltered && parentSha) {
+        try {
+          patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
+        } catch {
+          continue;
+        }
+        if (!patchContent.trim()) continue;
+      } else {
+        try {
+          patchContent = await this.git.formatPatch(commit.sha);
+        } catch {
+          this.warnings.push(
+            `Could not generate patch for commit ${commit.sha.slice(0, 7)} \u2014 it may be unreachable in a shallow clone. Skipping.`
+          );
+          continue;
         }
       }
-      if (files.length === 0) {
+      const contentHash = this.computeContentHash(patchContent);
+      if (lock.patches.find((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
         continue;
       }
       const theirsSnapshot = await capturePatchSnapshot(this.git, files, commit.sha);