Optimized commit message for git squash

lenneTech · Sep 12, 2022 · 66f193a · 66f193a
1 parent b117f0f
commit 66f193a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/cli",
-  "version": "0.0.77",
+  "version": "0.0.78",
   "description": "lenne.Tech CLI: lt",
   "keywords": [
     "lenne.Tech",

diff --git a/src/commands/git/squash.ts b/src/commands/git/squash.ts
@@ -62,6 +62,9 @@ const NewCommand: GluegunCommand = {
     }
     mergeBaseSpin.succeed();
 
+    // Get squash message (before reset)
+    const squashMessage = await git.getFirstBranchCommit(await git.currentBranch(), base);
+
     // Soft reset
     const resetSpin = spin('Soft reset');
     await git.reset(mergeBase, true);
@@ -100,7 +103,7 @@ const NewCommand: GluegunCommand = {
         await ask({
           type: 'input',
           name: 'message',
-          initial: await git.getFirstBranchCommit(await git.currentBranch(), base),
+          initial: squashMessage,
           message: 'Message: ',
         })
       ).message;
@@ -124,6 +127,9 @@ const NewCommand: GluegunCommand = {
     // Success
     success(`Squashed ${branch} in ${helper.msToMinutesAndSeconds(timer())}m.`);
     info('');
+    if (!toolbox.parameters.options.fromGluegunMenu) {
+      process.exit();
+    }
 
     // For tests
     return `squashed ${branch}`;