@harryisfish/gitt 1.6.5 → 1.6.7

package/dist/commands/clean.js

@@ -23,25 +23,21 @@ async function cleanDeletedBranches(options = {}) {
         // Phase 1: Discovery
         const discoveryTasks = new listr2_1.Listr([
             {
-                title: 'Switch to main branch',
+                title: 'Fetch and switch to main branch',
                 task: async (ctx) => {
                     const mainBranch = await (0, git_1.getMainBranch)();
                     ctx.mainBranch = mainBranch;
                     const branchInfo = await git.branchLocal();
                     ctx.currentBranch = branchInfo.current;
-                    // Always switch to main branch first
+                    // Fetch main branch first to avoid conflicts
+                    await git.fetch(['origin', mainBranch]);
+                    // Switch to main branch if not already on it
                     if (ctx.currentBranch !== mainBranch) {
                         await git.checkout(mainBranch);
                         await git.pull();
                     }
                 }
             },
-            {
-                title: 'Fetch from remote',
-                task: async (ctx) => {
-                    await git.fetch(['origin', ctx.mainBranch]);
-                }
-            },
             {
                 title: 'Analyze branches',
                 task: async (ctx) => {

package/dist/utils/git.js

@@ -79,11 +79,28 @@ async function setMainBranch(branch) {
 }
 /**
  * Check if a branch is merged into the main branch.
+ * Supports regular merge, squash merge, and rebase merge detection.
  */
 async function isBranchMerged(branch, mainBranch) {
     try {
+        // Method 1: Check regular merge with git branch --merged
         const mergedBranches = await git.branch(['--merged', mainBranch]);
-        return mergedBranches.all.includes(branch);
+        if (mergedBranches.all.includes(branch)) {
+            return true;
+        }
+        // Method 2: Check squash/rebase merge with git cherry
+        // git cherry returns empty or all lines start with '-' if fully merged
+        // '-' means the commit exists in upstream (merged)
+        // '+' means the commit does not exist in upstream (not merged)
+        const cherryOutput = await git.raw(['cherry', mainBranch, branch]);
+        const lines = cherryOutput.trim().split('\n').filter(Boolean);
+        // If no commits unique to branch, or all commits are merged (start with -)
+        if (lines.length === 0) {
+            return true;
+        }
+        // Check if all commits are merged (all lines start with '-')
+        const hasUnmergedCommits = lines.some(line => line.startsWith('+'));
+        return !hasUnmergedCommits;
     }
     catch (error) {
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.6.5",
+  "version": "1.6.7",
   "description": "A command-line tool to help you manage Git repositories and remote repositories, such as keeping in sync, pushing, pulling, etc.",
   "main": "dist/index.js",
   "bin": {