@harryisfish/gitt 1.6.4 → 1.6.6

package/dist/commands/clean.js

@@ -23,13 +23,19 @@ async function cleanDeletedBranches(options = {}) {
         // Phase 1: Discovery
         const discoveryTasks = new listr2_1.Listr([
             {
-                title: 'Fetch main from remote',
+                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;
+                    // 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();
+                    }
                 }
             },
             {
@@ -129,18 +135,6 @@ async function cleanDeletedBranches(options = {}) {
             state.deletedBranches.forEach(b => console.log(`  - ${b.name} (${b.reason})`));
             return;
         }
-        // Switch to main branch if current branch will be deleted
-        const willDeleteCurrent = state.deletedBranches.some(b => b.name === state.currentBranch);
-        if (willDeleteCurrent) {
-            try {
-                await git.checkout(state.mainBranch);
-                await git.pull();
-                console.log(`Switched to ${state.mainBranch} and synced with remote`);
-            }
-            catch (e) {
-                throw new errors_1.GitError(`Cannot switch to ${state.mainBranch}. Current branch "${state.currentBranch}" will be deleted but checkout failed: ${e instanceof Error ? e.message : 'Unknown error'}`);
-            }
-        }
         // Phase 3: Execution
         const deleteTasks = new listr2_1.Listr([
             {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harryisfish/gitt",
-  "version": "1.6.4",
+  "version": "1.6.6",
   "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": {