Handle missing Git in optional repo checks

.changeset/old-poems-speak.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Fix error reporting of cli-kit methods that try to run git when git is unavailable

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

@@ -311,6 +311,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 () => {
     const error = Object.assign(new Error('not a git repo'), {exitCode: 128})
     mockedExeca.mockRejectedValue(error)
@@ -326,6 +336,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(mockedExeca).not.toHaveBeenCalled()
+  })
+
   test('returns true if inside a git directory', async () => {
     mockGitCommand('.git')
 

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

@@ -349,7 +349,9 @@ export class OutsideGitDirectoryError extends AbortError {}
  * @param directory - The directory to check.
  */
 export async function ensureInsideGitDirectory(directory?: string): Promise<void> {
-  if (!(await insideGitDirectory(directory))) {
+  await ensureGitIsPresentOrAbort()
+
+  if (!(await checkIfInsideGitDirectory(directory))) {
     throw new OutsideGitDirectoryError(`${outputToken.path(directory ?? cwd())} is not a Git directory`)
   }
 }
@@ -361,6 +363,14 @@ 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> {
+  if (!(await hasGit())) {
+    return false
+  }
+
+  return checkIfInsideGitDirectory(directory)
+}
+
+async function checkIfInsideGitDirectory(directory?: string): Promise<boolean> {
   try {
     await execa('git', ['rev-parse', '--git-dir'], {cwd: directory})
     return true