Merge branch 'master' into dependabot/npm_and_yarn/npm-f4e71bc59b

MoegirlPediaInterfaceAdmins · Dec 26, 2023 · d565358 · d565358
2 parents 8715127 + 6c5f1b1
commit d565358
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/scripts/modules/createCommit.js b/scripts/modules/createCommit.js
@@ -14,7 +14,7 @@ export default async (message) => {
         return false;
     }
     if (!upstream) {
-        console.info("Running in github actions, but HEAD is not tracking any remote branch, exit.");
+        console.info("Running in github actions, but HEAD does not point to a branch, exit.");
         return false;
     }
     console.info("[createCommit] Running in github actions, try to create commit.");

diff --git a/scripts/modules/getUpstream.js b/scripts/modules/getUpstream.js
@@ -6,13 +6,18 @@ if (!isInGithubActions) {
     process.exit(0);
 }
 /**
- * @type { string | false } when false, it means the current branch is not tracking any remote branch.
+ * @type { string | false } when false, it means the current branch does not point to a branch.
  */
 let result;
 try {
     result = await git.revparse(["--abbrev-ref", "--symbolic-full-name", "@{upstream}"]);
+    console.info("[getUpstream]", "upstream:", result);
 } catch (e) {
-    console.error(e);
+    if (e?.message?.includes("HEAD does not point to a branch")) {
+        console.info("[getUpstream]", "HEAD does not point to a branch.");
+    } else {
+        console.error("[getUpstream]", "Unexpected error:", e);
+    }
     result = false;
 }
 export default result;
diff --git a/scripts/postCommit/push.js b/scripts/postCommit/push.js
@@ -10,7 +10,7 @@ if (!isInGithubActions) {
     process.exit(0);
 }
 if (!upstream) {
-    console.info("Running in github actions, but HEAD is not tracking any remote branch, exit.");
+    console.info("Running in github actions, but HEAD does not point to a branch, exit.");
     process.exit(0);
 }
 const GITHUB_EVENT = await readWorkflowEvent();