diff --git a/node-src/git/execGit.test.ts b/node-src/git/execGit.test.ts
new file mode 100644
index 000000000..09bee07ac
--- /dev/null
+++ b/node-src/git/execGit.test.ts
@@ -0,0 +1,167 @@
+import { PassThrough, Transform, Writable } from 'node:stream';
+import { beforeEach } from 'node:test';
+
+import { execaCommand as rawExecaCommand } from 'execa';
+import { describe, expect, it, vitest } from 'vitest';
+
+import gitNoCommits from '../ui/messages/errors/gitNoCommits';
+import gitNotInitialized from '../ui/messages/errors/gitNotInitialized';
+import gitNotInstalled from '../ui/messages/errors/gitNotInstalled';
+import { execGitCommand, execGitCommandCountLines, execGitCommandOneLine } from './execGit';
+
+vitest.mock('execa');
+
+const execaCommand = vitest.mocked(rawExecaCommand);
+beforeEach(() => {
+  execaCommand.mockReset();
+});
+
+describe('execGitCommand', () => {
+  it('returns execa output if it works', async () => {
+    execaCommand.mockResolvedValue({
+      all: Buffer.from('some output'),
+    } as any);
+
+    expect(await execGitCommand('some command')).toEqual('some output');
+  });
+
+  it('errors if there is no output', async () => {
+    execaCommand.mockResolvedValue({
+      all: undefined,
+    } as any);
+
+    await expect(execGitCommand('some command')).rejects.toThrow(/Unexpected missing git/);
+  });
+
+  it('handles missing git error', async () => {
+    execaCommand.mockRejectedValue(new Error('not a git repository'));
+
+    await expect(execGitCommand('some command')).rejects.toThrow(
+      gitNotInitialized({ command: 'some command' })
+    );
+  });
+
+  it('handles git not found error', async () => {
+    execaCommand.mockRejectedValue(new Error('git not found'));
+
+    await expect(execGitCommand('some command')).rejects.toThrow(
+      gitNotInstalled({ command: 'some command' })
+    );
+  });
+
+  it('handles no commits yet', async () => {
+    execaCommand.mockRejectedValue(new Error('does not have any commits yet'));
+
+    await expect(execGitCommand('some command')).rejects.toThrow(
+      gitNoCommits({ command: 'some command' })
+    );
+  });
+
+  it('rethrows arbitrary errors', async () => {
+    execaCommand.mockRejectedValue(new Error('something random'));
+    await expect(execGitCommand('some command')).rejects.toThrow('something random');
+  });
+});
+
+function createExecaStreamer() {
+  let resolver;
+  let rejecter;
+  const promiseLike = new Promise((aResolver, aRejecter) => {
+    resolver = aResolver;
+    rejecter = aRejecter;
+  }) as Promise<unknown> & {
+    stdout: Transform;
+    kill: () => void;
+    _rejecter: (err: Error) => void;
+  };
+  promiseLike.stdout = new PassThrough();
+  promiseLike.kill = resolver;
+  promiseLike._rejecter = rejecter;
+  return promiseLike;
+}
+
+describe('execGitCommandOneLine', () => {
+  it('returns the first line if the command works', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandOneLine('some command');
+
+    streamer.stdout.write('First line\n');
+    streamer.stdout.write('Second line\n');
+
+    expect(await promise).toEqual('First line');
+  });
+
+  it('returns the output if the command only has one line', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandOneLine('some command');
+
+    streamer.stdout.write('First line\n');
+    streamer.stdout.end();
+
+    expect(await promise).toEqual('First line');
+  });
+
+  it('Return an error if the command has no ouput', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandOneLine('some command');
+
+    streamer.kill();
+
+    await expect(promise).rejects.toThrow(/missing git command output/);
+  });
+
+  it('rethrows arbitrary errors', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandOneLine('some command');
+
+    streamer._rejecter(new Error('some error'));
+
+    await expect(promise).rejects.toThrow(/some error/);
+  });
+});
+
+describe('execGitCommandCountLines', () => {
+  it('counts lines, many', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandCountLines('some command');
+
+    streamer.stdout.write('First line\n');
+    streamer.stdout.write('Second line\n');
+    streamer.kill();
+
+    expect(await promise).toEqual(2);
+  });
+
+  it('counts lines, one', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandCountLines('some command');
+
+    streamer.stdout.write('First line\n');
+    streamer.kill();
+
+    expect(await promise).toEqual(1);
+  });
+
+  it('counts lines, none', async () => {
+    const streamer = createExecaStreamer();
+    execaCommand.mockReturnValue(streamer as any);
+
+    const promise = execGitCommandCountLines('some command');
+
+    streamer.kill();
+
+    expect(await promise).toEqual(0);
+  });
+});
diff --git a/node-src/git/execGit.ts b/node-src/git/execGit.ts
index 257964552..7a9b57e6b 100644
--- a/node-src/git/execGit.ts
+++ b/node-src/git/execGit.ts
@@ -29,7 +29,7 @@ export async function execGitCommand(
     const { all } = await execaCommand(command, { ...defaultOptions, ...options });
 
     if (all === undefined) {
-      throw new Error(`Unexpected missing git command output for command: '${command}`);
+      throw new Error(`Unexpected missing git command output for command: '${command}'`);
     }
 
     return all.toString();
@@ -70,7 +70,8 @@ export async function execGitCommandOneLine(
     // This promise will resolve only if there is an error or it times out
     (async () => {
       await process;
-      throw new Error(`Unexpected missing git command output for command: '${command}`);
+
+      throw new Error(`Unexpected missing git command output for command: '${command}'`);
     })(),
     // We expect this promise to resolve first
     new Promise<string>((resolve, reject) => {