socket 0.14.76 → 0.14.77

package/dist/module-sync/cli.js

@@ -914,7 +914,7 @@ function emitBanner(name) {
   logger.logger.error(getAsciiHeader(name))
 }
 function getAsciiHeader(command) {
-  const cliVersion = '0.14.76:c0c2e5d:cebdd6b8:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
+  const cliVersion = '0.14.77:08d925d:3b454b2e:pub' // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION_HASH']".
   const nodeVersion = process$1.version
   const apiToken = shadowNpmInject.getDefaultToken()
   const shownToken = apiToken ? getLastFiveOfApiToken(apiToken) : 'no'
@@ -3172,9 +3172,18 @@ async function commitAndPushFix(branchName, commitMsg, cwd) {
     return
   }
   const baseBranch = process.env['GITHUB_REF_NAME'] ?? 'main'
-  await spawn.spawn('git', ['checkout', baseBranch], {
-    cwd
-  })
+  try {
+    await spawn.spawn('git', ['checkout', baseBranch], {
+      cwd
+    })
+    await spawn.spawn('git', ['pull', '--ff-only'], {
+      cwd
+    })
+  } catch (err) {
+    logger.logger.warn(
+      `Could not switch to ${baseBranch}. Proceeding with current HEAD.`
+    )
+  }
   await spawn.spawn('git', ['checkout', '-b', branchName], {
     cwd
   })
@@ -11052,7 +11061,7 @@ void (async () => {
   await updateNotifier({
     name: SOCKET_CLI_BIN_NAME,
     // The '@rollup/plugin-replace' will replace "process.env['INLINED_SOCKET_CLI_VERSION']".
-    version: '0.14.76',
+    version: '0.14.77',
     ttl: 86_400_000 /* 24 hours in milliseconds */
   })
   try {
@@ -11123,5 +11132,5 @@ void (async () => {
     await shadowNpmInject.captureException(e)
   }
 })()
-//# debugId=7b5e4128-ae18-4469-a1c0-b42618fc580c
+//# debugId=c8920518-ecaf-443d-93ff-0b79e218f5c4
 //# sourceMappingURL=cli.js.map