@socketsecurity/cli-with-sentry 1.0.37 → 1.0.38

package/dist/cli.js

@@ -3096,7 +3096,22 @@ async function gitCleanFdx(cwd = process.cwd()) {
   // TODO: propagate CResult?
   await spawn.spawn('git', ['clean', '-fdx'], stdioIgnoreOptions);
 }
+async function gitCheckoutBranch(branch, cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
+  };
+  try {
+    await spawn.spawn('git', ['checkout', branch], stdioIgnoreOptions);
+    return true;
+  } catch {}
+  return false;
+}
 async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
+  if (!filepaths.length) {
+    debug.debugFn('notice', `miss: no filepaths to add`);
+    return false;
+  }
   const {
     cwd = process.cwd(),
     // Lazily access constants.ENV.SOCKET_CLI_GIT_USER_EMAIL.
@@ -3124,9 +3139,17 @@ async function gitCreateAndPushBranch(branch, commitMsg, filepaths, options) {
       error: e
     });
   }
+  return false;
+}
+async function gitDeleteBranch(branch, cwd = process.cwd()) {
+  const stdioIgnoreOptions = {
+    cwd,
+    stdio: debug.isDebug('stdio') ? 'inherit' : 'ignore'
+  };
   try {
     // Will throw with exit code 1 if branch does not exist.
     await spawn.spawn('git', ['branch', '-D', branch], stdioIgnoreOptions);
+    return true;
   } catch {}
   return false;
 }
@@ -4029,6 +4052,8 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
             if (fixEnv.isCi) {
               // eslint-disable-next-line no-await-in-loop
               await gitResetAndClean(fixEnv.baseBranch, cwd);
+              // eslint-disable-next-line no-await-in-loop
+              await gitCheckoutBranch(fixEnv.baseBranch, cwd);
             }
             continue infosLoop;
           }
@@ -4094,6 +4119,10 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
                 // eslint-disable-next-line no-await-in-loop
                 await gitResetAndClean(fixEnv.baseBranch, cwd);
                 // eslint-disable-next-line no-await-in-loop
+                await gitCheckoutBranch(fixEnv.baseBranch, cwd);
+                // eslint-disable-next-line no-await-in-loop
+                await gitDeleteBranch(branch, cwd);
+                // eslint-disable-next-line no-await-in-loop
                 const maybeActualTree = await installer(pkgEnvDetails, {
                   cwd,
                   spinner
@@ -4150,7 +4179,9 @@ async function agentFix(pkgEnvDetails, actualTree, alertsMap, installer, {
           if (fixEnv.isCi) {
             spinner?.start();
             // eslint-disable-next-line no-await-in-loop
-            await gitResetAndClean(fixEnv.baseBranch, cwd);
+            await gitResetAndClean(branch, cwd);
+            // eslint-disable-next-line no-await-in-loop
+            await gitCheckoutBranch(fixEnv.baseBranch, cwd);
             // eslint-disable-next-line no-await-in-loop
             const maybeActualTree = await installer(pkgEnvDetails, {
               cwd,
@@ -14262,5 +14293,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=66b4f897-caf8-4f1b-ac3a-1f9030377bf2
+//# debugId=cb6e977b-e9db-4f34-bf64-f5a47c14882c
 //# sourceMappingURL=cli.js.map