Commit f0719072a1c6435b5a91243afc57bc8bf1f3e2b6 | the-knife

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>

2 files changed, 26 insertions(+), 4 deletions(-)

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

...	...	@@ -950,6 +950,27 @@ it.layer(TestLayer)("GitVcsDriver core integration", (it) => {
950	950	}),
951	951	);
952	952
	953	it.effect("reports changes to a file named HEAD", () =>
	954	Effect.gen(function* () {
	955	const cwd = yield* makeTmpDir();
	956	yield* initRepoWithCommit(cwd);
	957	yield* writeTextFile(cwd, "HEAD", "first line\n");
	958	yield* git(cwd, ["add", "HEAD"]);
	959	yield* git(cwd, ["commit", "-m", "add HEAD file"]);
	960	yield* writeTextFile(cwd, "HEAD", "first line\nsecond line\n");
	961
	962	const status = yield* (yield* GitVcsDriver.GitVcsDriver).statusDetails(cwd);
	963
	964	assert.equal(status.isRepo, true);
	965	assert.equal(status.hasWorkingTreeChanges, true);
	966	assert.deepInclude(status.workingTree.files, {
	967	path: "HEAD",
	968	insertions: 1,
	969	deletions: 0,
	970	});
	971	}),
	972	);
	973
953	974	it.effect("reports default-branch delta separately from upstream delta", () =>
954	975	Effect.gen(function* () {
955	976	const cwd = yield* makeTmpDir();

apps/server/src/vcs/GitVcsDriverCore.ts+5-4

...	...	@@ -420,9 +420,10 @@ function isNonRepositoryGitStderr(stderr: string): boolean {
420	420	return stderr.toLowerCase().includes("not a git repository");
421	421	}
422	422	function isUnbornHeadStderr(stderr: string): boolean {
	423	const normalized = stderr.toLowerCase();
423	424	return (
424		stderr.toLowerCase().includes("unknown revision") &&
425		stderr.toLowerCase().includes("path not in the working tree")
	425	normalized.includes("bad revision 'head'") \|\|
	426	(normalized.includes("unknown revision") && normalized.includes("path not in the working tree"))
426	427	);
427	428	}
428	429
...	...	@@ -1600,7 +1601,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
1600	1601	executeGitWithStableDiagnostics(
1601	1602	"GitVcsDriver.statusDetails.numstat",
1602	1603	cwd,
1603		["diff", "HEAD", "--numstat"],
	1604	["diff", "HEAD", "--numstat", "--"],
1604	1605	{ allowNonZeroExit: true },
1605	1606	).pipe(
1606	1607	Effect.flatMap((result) => {
...	...	@@ -1642,7 +1643,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
1642	1643	...gitCommandContext({
1643	1644	operation: "GitVcsDriver.statusDetails.numstat",
1644	1645	cwd,
1645		args: ["diff", "HEAD", "--numstat"],
	1646	args: ["diff", "HEAD", "--numstat", "--"],
1646	1647	}),
1647	1648	detail: "git diff HEAD --numstat failed.",
1648	1649	exitCode: result.exitCode,