🐛 Cancel hook when merging (#783)

carloscuesta · Mar 12, 2022 · c8ff1cd · c8ff1cd
1 parent 78f3783
commit c8ff1cd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/commands/commit/withHook/index.js b/src/commands/commit/withHook/index.js
@@ -51,7 +51,11 @@ export const cancelIfAmending = () =>
       `gitmoji --hook $1 $2`
     */
     const commitMessageSource: ?string = process.argv[COMMIT_MESSAGE_SOURCE]
-    if (commitMessageSource && commitMessageSource.startsWith('commit')) {
+    if (
+      commitMessageSource &&
+      (commitMessageSource.startsWith('commit') ||
+        commitMessageSource.startsWith('merge'))
+    ) {
       process.exit(0)
     }
     resolve()

diff --git a/test/commands/commit.spec.js b/test/commands/commit.spec.js
@@ -303,6 +303,25 @@ describe('commit command', () => {
         expect(process.exit).toHaveBeenCalledWith(0)
       })
     })
+
+    describe('with git auto merge trigger by git pull', () => {
+      it('should cancel the hook', async () => {
+        mockProcess.mockProcessExit(new Error('ProcessExit0'))
+        execa.mockReturnValueOnce(Promise.resolve(stubs.gitAbsoluteDir))
+        // mock that we are merging
+        process.argv[3] = '.git/MERGE_MSG'
+        process.argv[COMMIT_MESSAGE_SOURCE] = 'merge'
+
+        try {
+          await commit({ mode: 'hook' })
+        } catch (e) {
+          expect(e.message).toMatch('ProcessExit0')
+        }
+
+        expect(process.exit).toHaveBeenCalledWith(0)
+      })
+    })
+
   })
 
   describe('guard', () => {