Avoid showing outdated tilde

rematocorp · Feb 26, 2024 · c05fdbf · c05fdbf
1 parent 3abbcd6
commit c05fdbf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -35919,7 +35919,7 @@ async function run() {
         await (0, bash_1.exec)(`git -C ${path} fetch --depth=100 origin main`);
         await (0, bash_1.exec)(`git -C ${path} fetch --depth=100 origin +refs/heads/*:refs/remotes/origin/*`);
         const commitHash = await (0, bash_1.exec)(`git -C ${path} rev-parse HEAD`);
-        const branch = (await (0, bash_1.exec)(`git -C ${path} name-rev --name-only HEAD`)).replace('remotes/origin/', '');
+        const branch = await getBranchName(path);
         const behind = await getBehind(path, commitHash);
         const ahead = await (0, bash_1.exec)(`git -C ${path} rev-list --count origin/main..HEAD`);
         const submoduleName = await (0, bash_1.exec)(`basename $(git -C ${path} rev-parse --show-toplevel)`);
@@ -35937,6 +35937,10 @@ ${links}`;
     await comment(messages.join('\n'));
 }
 exports.run = run;
+async function getBranchName(path) {
+    const branchName = await (0, bash_1.exec)(`git -C ${path} name-rev --name-only HEAD`);
+    return branchName.replace('remotes/origin/', '').replace(/~.*$/, '');
+}
 async function getBehind(path, commitHash) {
     const behind = await (0, bash_1.exec)(`git -C ${path} rev-list --count HEAD..origin/main`);
     const behindTime = Number(behind) ? await getBehindTime(path, commitHash) : '';

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@remato/submodule-status-commenter",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"license": "MIT",
 	"description": "GitHub action to comment submodules current branch and state to the PR",
 	"main": "dist/index.js",

diff --git a/src/main.ts b/src/main.ts
@@ -16,7 +16,7 @@ export async function run() {
 			await exec(`git -C ${path} fetch --depth=100 origin +refs/heads/*:refs/remotes/origin/*`)
 
 			const commitHash = await exec(`git -C ${path} rev-parse HEAD`)
-			const branch = (await exec(`git -C ${path} name-rev --name-only HEAD`)).replace('remotes/origin/', '')
+			const branch = await getBranchName(path)
 			const behind = await getBehind(path, commitHash)
 			const ahead = await exec(`git -C ${path} rev-list --count origin/main..HEAD`)
 			const submoduleName = await exec(`basename $(git -C ${path} rev-parse --show-toplevel)`)
@@ -37,6 +37,12 @@ ${links}`
 	await comment(messages.join('\n'))
 }
 
+async function getBranchName(path: string) {
+	const branchName = await exec(`git -C ${path} name-rev --name-only HEAD`)
+
+	return branchName.replace('remotes/origin/', '').replace(/~.*$/, '')
+}
+
 async function getBehind(path: string, commitHash: string) {
 	const behind = await exec(`git -C ${path} rev-list --count HEAD..origin/main`)
 	const behindTime = Number(behind) ? await getBehindTime(path, commitHash) : ''