Handle missing Git in repo checks

Author: charlespwd

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

@@ -382,6 +382,16 @@ describe('ensurePresentOrAbort()', () => {
 })
 
 describe('ensureInsideGitDirectory()', () => {
+  test('throws a friendly error if git is not present', async () => {
+    // Given
+    vi.mocked(hasGit).mockResolvedValue(false)
+
+    // Then
+    await expect(() => git.ensureInsideGitDirectory()).rejects.toThrowError(
+      /Git is necessary in the environment to continue/,
+    )
+  })
+
   test('throws an error if not inside a git directory', async () => {
     // Given
     mockedCheckIsRepo.mockResolvedValue(false)
@@ -400,6 +410,15 @@ describe('ensureInsideGitDirectory()', () => {
 })
 
 describe('insideGitDirectory()', () => {
+  test('returns false if git is not present', async () => {
+    // Given
+    vi.mocked(hasGit).mockResolvedValue(false)
+
+    // Then
+    await expect(git.insideGitDirectory()).resolves.toBe(false)
+    expect(simpleGit).not.toHaveBeenCalled()
+  })
+
   test('returns true if inside a git directory', async () => {
     // Given
     mockedCheckIsRepo.mockResolvedValue(true)

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

@@ -318,9 +318,11 @@ export class OutsideGitDirectoryError extends AbortError {}
  * @param directory - The directory to check.
  */
 export async function ensureInsideGitDirectory(directory?: string): Promise<void> {
+  await ensureGitIsPresentOrAbort()
+
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  if (!(await insideGitDirectory(directory))) {
+  if (!(await checkIfInsideGitDirectory(directory))) {
     throw new OutsideGitDirectoryError(`${outputToken.path(directory || cwd())} is not a Git directory`)
   }
 }
@@ -332,7 +334,11 @@ export async function ensureInsideGitDirectory(directory?: string): Promise<void
  * @returns True if the directory is inside a .git directory tree.
  */
 export async function insideGitDirectory(directory?: string): Promise<boolean> {
-  return withGit({directory}, (repo) => repo.checkIsRepo())
+  if (!(await hasGit())) {
+    return false
+  }
+
+  return checkIfInsideGitDirectory(directory)
 }
 
 export class GitDirectoryNotCleanError extends AbortError {}
@@ -394,6 +400,10 @@ export async function removeGitRemote(directory: string, remoteName = 'origin'):
   })
 }
 
+async function checkIfInsideGitDirectory(directory?: string): Promise<boolean> {
+  return withGit({directory}, (repo) => repo.checkIsRepo())
+}
+
 async function withGit<T>(
   {
     directory,