Fix tests and variable shadowing bug in withGit helper

Author: katiebauchman

packages/cli-kit/src/public/node/git.test.ts

@@ -252,7 +252,7 @@ describe('initializeRepository()', () => {
 
     // Then
     expect(simpleGit).toHaveBeenCalledOnce()
-    expect(simpleGit).toHaveBeenCalledWith('/tmp/git-repo')
+    expect(simpleGit).toHaveBeenCalledWith({baseDir: '/tmp/git-repo'})
 
     expect(mockedInit).toHaveBeenCalledOnce()
     expect(mockedCheckout).toHaveBeenCalledOnce()
@@ -617,7 +617,7 @@ describe('removeGitRemote()', () => {
     await git.removeGitRemote(directory, remoteName)
 
     // Then
-    expect(simpleGit).toHaveBeenCalledWith(directory)
+    expect(simpleGit).toHaveBeenCalledWith({baseDir: directory})
     expect(mockedGetRemotes).toHaveBeenCalled()
     expect(mockedRemoveRemote).toHaveBeenCalledWith(remoteName)
   })
@@ -635,7 +635,7 @@ describe('removeGitRemote()', () => {
     await git.removeGitRemote(directory, remoteName)
 
     // Then
-    expect(simpleGit).toHaveBeenCalledWith(directory)
+    expect(simpleGit).toHaveBeenCalledWith({baseDir: directory})
     expect(mockedGetRemotes).toHaveBeenCalled()
     expect(mockedRemoveRemote).not.toHaveBeenCalled()
   })

packages/cli-kit/src/public/node/git.ts

@@ -381,9 +381,9 @@ async function withGit<T>({
 }): Promise<T> {
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  const git = git({baseDir: directory})
+  const repo = git({baseDir: directory})
   try {
-    return await callback(git)
+    return await callback(repo)
   } catch (err) {
     if (err instanceof Error) {
       const abortError = new AbortError(err.message)