@harryisfish/gitt 1.6.3 → 1.6.5

package/dist/commands/clean.js

@@ -23,13 +23,23 @@ async function cleanDeletedBranches(options = {}) {
         // Phase 1: Discovery
         const discoveryTasks = new listr2_1.Listr([
             {
-                title: 'Fetch main from remote',
+                title: '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;
-                    await git.fetch(['origin', mainBranch]);
+                    // Always switch to main branch first
+                    if (ctx.currentBranch !== mainBranch) {
+                        await git.checkout(mainBranch);
+                        await git.pull();
+                    }
+                }
+            },
+            {
+                title: 'Fetch from remote',
+                task: async (ctx) => {
+                    await git.fetch(['origin', ctx.mainBranch]);
                 }
             },
             {
@@ -129,18 +139,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/dist/index.js

@@ -86,11 +86,12 @@ async function main() {
         program
             .option('-i, --interactive', 'Interactive mode: Select branches to delete')
             .option('-d, --dry-run', 'Dry run: Show what would be deleted without deleting')
-            .option('--stale [days]', 'Find stale branches (default: 90 days)', '90')
+            .option('--stale [days]', 'Find stale branches (default: 90 days)')
             .action(async (options) => {
             await checkGitRepo();
-            const staleDays = options.stale === true ? 90 : parseInt(options.stale, 10);
+            // options.stale is undefined when not passed, true when passed without value, or a string when passed with value
             const isStale = options.stale !== undefined;
+            const staleDays = options.stale === true || options.stale === undefined ? 90 : parseInt(options.stale, 10);
             await (0, clean_1.cleanDeletedBranches)({
                 interactive: options.interactive || false,
                 dryRun: options.dryRun || false,

package/package.json

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