🐛 Do not try to push fixes, if there are none

JetBrains · Jul 18, 2023 · ef55588 · ef55588
1 parent a3d8799
commit ef55588
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/scan/dist/index.js b/scan/dist/index.js
@@ -69220,7 +69220,12 @@ var require_utils8 = __commonJS({
           yield git(["reset", "--hard", `origin/${currentBranch}`]);
           yield git(["stash", "apply", "stash@{0}"]);
         }
-        yield git(["commit", "-m", commitMessage]);
+        const exitCode = yield git(["commit", "-m", commitMessage], {
+          ignoreReturnCode: true
+        });
+        if (exitCode !== 0) {
+          return;
+        }
         yield git(["pull", "--rebase", "origin", currentBranch]);
         if (mode === qodana_12.BRANCH) {
           yield git(["push", "origin", currentBranch]);

diff --git a/scan/src/utils.ts b/scan/src/utils.ts
@@ -124,7 +124,13 @@ export async function pushQuickFixes(
     await git(['reset', '--hard', `origin/${currentBranch}`])
     await git(['stash', 'apply', 'stash@{0}'])
   }
-  await git(['commit', '-m', commitMessage])
+  const exitCode = await git(['commit', '-m', commitMessage], {
+    ignoreReturnCode: true
+  })
+  if (exitCode !== 0) {
+    return
+  }
+
   await git(['pull', '--rebase', 'origin', currentBranch])
   if (mode === BRANCH) {
     await git(['push', 'origin', currentBranch])