Merge pull request #470 from capitalone-contributions/wrslatz-simple-git-fix

fix: remove unneeded git hooks config

Author: wrslatz

src/server/git/controller.ts

@@ -59,8 +59,6 @@ export const syncReposHandler = async ({
       config: [
         `user.name=pma[bot]`,
         `user.email=${input.source.octokit.installationId}+pma[bot]@users.noreply.github.com`,
-        // Disable any global git hooks to prevent potential interference when running the app locally
-        'core.hooksPath=/dev/null',
       ],
     }
 
@@ -129,7 +127,7 @@ export const syncReposHandler = async ({
           )
 
           // Push this back to the source branch to retrigger the sync
-          await git.push(['--force'])
+          await git.push(['--no-verify', '--force'])
 
           // Return to end function call
           return {
@@ -147,12 +145,12 @@ export const syncReposHandler = async ({
     gitApiLogger.debug('Checked out branch', input.destination.branch)
 
     // Fast Forward merge the source branch on top of the destination branch
-    await git.merge(['--ff-only', input.source.branch]) // shouldn't fail because of check above, but nothing done to handle a failure
+    await git.merge(['--no-verify', '--ff-only', input.source.branch]) // shouldn't fail because of check above, but nothing done to handle a failure
     gitApiLogger.debug(
       `Merged source branch: ${input.source.branch} into destination branch: ${input.destination.branch} using fast forward`,
     )
 
-    await git.push(['--force'])
+    await git.push(['--no-verify', '--force'])
 
     gitApiLogger.debug(
       `Pushed to ${input.destination.org}/${input.destination.repo}/${input.destination.branch}`,

src/server/repos/controller.ts

@@ -94,8 +94,6 @@ export const createMirrorHandler = async ({
         `user.name=pma[bot]`,
         // We want to use the private installation ID as the email so that we can push to the private repo
         `user.email=${privateInstallationId}+pma[bot]@users.noreply.github.com`,
-        // Disable any global git hooks to prevent potential interference when running the app locally
-        'core.hooksPath=/dev/null',
       ],
     }
     const git = simpleGit(tempDir, options)
@@ -149,11 +147,11 @@ export const createMirrorHandler = async ({
       newRepo.data.name,
     )
     await git.addRemote('upstream', upstreamRemote)
-    await git.push('upstream', defaultBranch)
+    await git.push(['--no-verify', 'upstream', defaultBranch])
 
     // Create a new branch on both
     await git.checkoutBranch(input.newBranchName, defaultBranch)
-    await git.push('origin', input.newBranchName)
+    await git.push(['--no-verify', 'origin', input.newBranchName])
 
     reposApiLogger.info('Mirror created', {
       org: newRepo.data.owner.login,

test/server/git/controller.test.ts

@@ -187,9 +187,13 @@ describe('Git controller', () => {
       'destination/destinationBranch',
     )
     expect(gitMock.merge).toHaveBeenCalledTimes(1)
-    expect(gitMock.merge).toHaveBeenCalledWith(['--ff-only', 'sourceBranch'])
+    expect(gitMock.merge).toHaveBeenCalledWith([
+      '--no-verify',
+      '--ff-only',
+      'sourceBranch',
+    ])
     expect(gitMock.push).toHaveBeenCalledTimes(1)
-    expect(gitMock.push).toHaveBeenCalledWith(['--force'])
+    expect(gitMock.push).toHaveBeenCalledWith(['--no-verify', '--force'])
   })
 
   it('should be syncable, have the environment flag set to true, but not be a merge commit', async () => {
@@ -265,9 +269,13 @@ describe('Git controller', () => {
       'destination/destinationBranch',
     )
     expect(gitMock.merge).toHaveBeenCalledTimes(1)
-    expect(gitMock.merge).toHaveBeenCalledWith(['--ff-only', 'sourceBranch'])
+    expect(gitMock.merge).toHaveBeenCalledWith([
+      '--no-verify',
+      '--ff-only',
+      'sourceBranch',
+    ])
     expect(gitMock.push).toHaveBeenCalledTimes(1)
-    expect(gitMock.push).toHaveBeenCalledWith(['--force'])
+    expect(gitMock.push).toHaveBeenCalledWith(['--no-verify', '--force'])
   })
 
   it('should be syncable, have the environment flag set to true, be a merge commit, but not be a merge to main branch', async () => {
@@ -348,9 +356,13 @@ describe('Git controller', () => {
       'destination/destinationBranch',
     )
     expect(gitMock.merge).toHaveBeenCalledTimes(1)
-    expect(gitMock.merge).toHaveBeenCalledWith(['--ff-only', 'sourceBranch'])
+    expect(gitMock.merge).toHaveBeenCalledWith([
+      '--no-verify',
+      '--ff-only',
+      'sourceBranch',
+    ])
     expect(gitMock.push).toHaveBeenCalledTimes(1)
-    expect(gitMock.push).toHaveBeenCalledWith(['--force'])
+    expect(gitMock.push).toHaveBeenCalledWith(['--no-verify', '--force'])
   })
 
   it('should be syncable, have the environment flag set to true, be a merge commit, and be a merge to main branch,', async () => {
@@ -429,6 +441,6 @@ describe('Git controller', () => {
     expect(gitMock.reset).toHaveBeenCalledTimes(1)
     expect(gitMock.reset).toHaveBeenCalledWith(['--hard', 'HEAD^2'])
     expect(gitMock.push).toHaveBeenCalledTimes(1)
-    expect(gitMock.push).toHaveBeenCalledWith(['--force'])
+    expect(gitMock.push).toHaveBeenCalledWith(['--no-verify', '--force'])
   })
 })