🚑 Don't include undefined in message body (#1083)

* 🚑 Make sure we don't write undefined in the message body * 🎨 Construct args in one go
carloscuesta · May 9, 2023 · c6561ee · c6561ee
1 parent ed57cba
commit c6561ee
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/commands/commit/prompts.js b/src/commands/commit/prompts.js
@@ -23,7 +23,7 @@ export type Answers = {
   gitmoji: string,
   scope?: string,
   title: string,
-  message: string
+  message?: string
 }
 
 export default (

diff --git a/src/commands/commit/withClient/index.js b/src/commands/commit/withClient/index.js
@@ -28,7 +28,12 @@ const withClient = async (answers: Answers): Promise<void> => {
 
     await execa(
       'git',
-      ['commit', isAutoAddEnabled ? '-am' : '-m', title, '-m', answers.message],
+      [
+        'commit',
+        isAutoAddEnabled ? '-am' : '-m',
+        title,
+        ...(answers.message ? ['-m', answers.message] : [])
+      ],
       {
         buffer: false,
         stdio: 'inherit'

diff --git a/src/commands/commit/withHook/index.js b/src/commands/commit/withHook/index.js
@@ -8,7 +8,9 @@ const withHook = (answers: Answers) => {
   try {
     const scope = answers.scope ? `(${answers.scope}): ` : ''
     const title = `${answers.gitmoji} ${scope}${answers.title}`
-    const commitMessage = `${title}\n\n${answers.message}`
+    const commitMessage = `${title}${
+      answers.message ? `\n\n${answers.message}` : ''
+    }`
 
     fs.writeFileSync(process.argv[3], commitMessage)
   } catch (error) {