Commit 9c7622dac3d1a385351e6c74354a9e6b9c2037d5 | the-knife

author	t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> 2026-08-10 23:34:18-04:00
committer	GitHub <noreply@github.com> 2026-08-10 23:34:18-04:00
log	9c7622dac3d1a385351e6c74354a9e6b9c2037d5
tree	b17cbdbf114c6972129dddd4344b8c4587d2c5e3
parent	c14bcca1035895edca5ebd8d65faea5fe788a825
signature	Signed by PGP key B5690EEEBB952194

fix(server): handle unborn HEAD in VCS status (#5944)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

2 files changed, 41 insertions(+), 14 deletions(-)

apps
- server
  - src
    vcs
    GitVcsDriverCore.test.ts
    GitVcsDriverCore.ts

apps/server/src/vcs/GitVcsDriverCore.test.ts+17

...	@@ -1001,6 +1001,23 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {	...	@@ -1001,6 +1001,23 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {
1001	}),	1001	}),
1002	);	1002	);
1003		1003
		1004	it.effect("reports remote status on unborn HEAD without failing", () =>
		1005	Effect.gen(function* () {
		1006	const cwd = yield* makeTmpDir();
		1007	const driver = yield* GitVcsDriver.GitVcsDriver;
		1008	yield* driver.initRepo({ cwd });
		1009	const initialBranch = yield* git(cwd, ["symbolic-ref", "--short", "HEAD"]);
		1010
		1011	const status = yield* driver.statusDetailsRemote(cwd, { refreshUpstream: false });
		1012
		1013	assert.equal(status.isRepo, true);
		1014	assert.equal(status.branch, initialBranch);
		1015	assert.equal(status.hasUpstream, false);
		1016	assert.equal(status.aheadCount, 0);
		1017	assert.equal(status.behindCount, 0);
		1018	}),
		1019	);
		1020
1004	it.effect("can read cached remote divergence without fetching upstream", () =>	1021	it.effect("can read cached remote divergence without fetching upstream", () =>
1005	Effect.gen(function* () {	1022	Effect.gen(function* () {
1006	const cwd = yield* makeTmpDir();	1023	const cwd = yield* makeTmpDir();

apps/server/src/vcs/GitVcsDriverCore.ts+24-14

 @@ -1477,25 +1477,35 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     if (branchResult === null) {
       return NON_REPOSITORY_REMOTE_STATUS_DETAILS;
     }
+    let branch: string | null;
     if (branchResult.exitCode !== 0) {
       if (isNonRepositoryGitStderr(branchResult.stderr)) {
         return NON_REPOSITORY_REMOTE_STATUS_DETAILS;
       }
-      return yield* new GitCommandError({
+      if (!isUnbornHeadStderr(branchResult.stderr)) {
-        ...gitCommandContext({
+        return yield* new GitCommandError({
-          operation: "GitVcsDriver.statusDetailsRemote.branch",
+          ...gitCommandContext({
-          cwd,
+            operation: "GitVcsDriver.statusDetailsRemote.branch",
-          args: ["rev-parse", "--abbrev-ref", "HEAD"],
+            cwd,
-        }),
+            args: ["rev-parse", "--abbrev-ref", "HEAD"],
-        detail: "Git branch lookup failed.",
+          }),
-        exitCode: branchResult.exitCode,
+          detail: "Git branch lookup failed.",
-        stdoutLength: branchResult.stdout.length,
+          exitCode: branchResult.exitCode,
-        stderrLength: branchResult.stderr.length,
+          stdoutLength: branchResult.stdout.length,
-      });
+          stderrLength: branchResult.stderr.length,
-    }
+        });
+      }
-    const branchValue = branchResult.stdout.trim();
+      const branchValue = yield* runGitStdout(
-    const branch = branchValue.length > 0 && branchValue !== "HEAD" ? branchValue : null;
+        "GitVcsDriver.statusDetailsRemote.unbornBranch",
+        cwd,
+        ["symbolic-ref", "--quiet", "--short", "HEAD"],
+      );
+      branch = branchValue.trim() || null;
+    } else {
+      const branchValue = branchResult.stdout.trim();
+      branch = branchValue.length > 0 && branchValue !== "HEAD" ? branchValue : null;
+    }
     const upstream = yield* resolveCurrentUpstream(cwd);
     const upstreamRef = upstream?.upstreamRef ?? null;
     let aheadCount = 0;