Merge branch 'release/0.1.2'

Author: VChet

.release-it.json

@@ -20,6 +20,7 @@
     }
   },
   "hooks": {
+    "before:init": ["npm run lint:all", "npm run test"],
     "after:bump": "npm run build"
   }
 }

CHANGELOG.md

@@ -1,3 +1,9 @@
 # Changelog
 
+## [0.1.2](https://github.com/VChet/git-merged-branches/compare/0.1.1...0.1.2) (2025-04-15)
+
+### Features
+
+* ignore branches on the same commit as the base branch ([07e097a](https://github.com/VChet/git-merged-branches/commit/07e097ac159b47346061031350d14225ed2e5f06))
+
 ## [0.1.1](https://github.com/VChet/git-merged-branches/compare/0.1.0...0.1.1) (2025-04-13)

README.md

@@ -47,7 +47,7 @@ Example configuration:
 
 ```json
 "git-merged-branches": {
-  "issueUrlFormat": "https://your-jira-instance.net",
+  "issueUrlFormat": "https://your-jira-instance.net/browse",
   "issueUrlPrefix": "TOKEN"
 }
 ```

package.json

@@ -2,7 +2,7 @@
   "name": "git-merged-branches",
   "description": "CLI tool to list all Git branches merged into a base branch with issue link formatting",
   "type": "module",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "MIT",
   "author": {
     "name": "VChet",
@@ -31,7 +31,7 @@
     "lint:js": "eslint .",
     "lint:js:fix": "npm run lint:js -- --fix",
     "lint:all": "npm run lint:ts && npm run lint:js",
-    "test": "vitest",
+    "test": "vitest --run",
     "release": "release-it"
   },
   "devDependencies": {

src/repo.ts

@@ -27,11 +27,16 @@ export function getDefaultTargetBranch(): string | null {
 }
 
 export function getMergedBranches(targetBranch: string): string[] {
+  const baseCommit = execSync(`git rev-parse ${targetBranch}`, { encoding: "utf-8" }).trim();
   const output = execSync(`git branch --merged ${targetBranch}`, { encoding: "utf-8" });
   return output.split("\n").reduce((acc: string[], line) => {
-    const branch = line.trim();
-    if (branch && !branch.includes(targetBranch)) { return [...acc, branch]; }
-    return acc
+    // Ignore empty lines
+    const branch = line.replace('*', '').trim();
+    if (!branch) { return acc; }
+    // Ignore branches on the base commit
+    const branchCommit = execSync(`git rev-parse ${branch}`, { encoding: "utf-8" }).trim();
+    if (branchCommit === baseCommit) { return acc; }
+    return [...acc, branch];
   }, []);
 }