@argos-ci/core 4.0.1 → 4.0.2

package/dist/index.js

@@ -57,23 +57,30 @@ function getRepositoryURL() {
     return null;
   }
 }
-function getMergeBaseCommitShaWithDepth(input) {
-  execSync(
-    `git fetch --update-head-ok --depth ${input.depth} origin ${input.head}:${input.head}`
-  );
+function gitMergeBase(input) {
+  try {
+    return execSync(`git merge-base ${input.head} ${input.base}`).toString().trim();
+  } catch (error) {
+    if (checkIsExecError(error) && error.status === 1 && error.stderr.toString() === "") {
+      return null;
+    }
+    throw error;
+  }
+}
+function gitFetch(input) {
   execSync(
-    `git fetch --update-head-ok --depth ${input.depth} origin ${input.base}:${input.base}`
+    `git fetch --update-head-ok --depth ${input.depth} origin ${input.ref}:${input.ref}`
   );
-  const mergeBase = execSync(`git merge-base ${input.head} ${input.base}`).toString().trim();
-  return mergeBase || null;
+}
+function checkIsExecError(error) {
+  return error instanceof Error && "status" in error && typeof error.status === "number" && "stderr" in error && Buffer.isBuffer(error.stderr);
 }
 function getMergeBaseCommitSha(input) {
   let depth = 200;
   while (depth < 1e3) {
-    const mergeBase = getMergeBaseCommitShaWithDepth({
-      depth,
-      ...input
-    });
+    gitFetch({ ref: input.head, depth });
+    gitFetch({ ref: input.base, depth });
+    const mergeBase = gitMergeBase(input);
     if (mergeBase) {
       return mergeBase;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "type": "module",
   "main": "./dist/index.cjs",
   "exports": {
@@ -64,5 +64,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "db55659eaaffc6a3a92655f621be0d6344901da2"
+  "gitHead": "7a4fac1862698b69ad47fa0c58e1fa5c13d6686f"
 }