Skip to content

Commit 4c83fbf

Browse files
committed
fix(server): skip worktrees for non-git projects
1 parent f877402 commit 4c83fbf

2 files changed

Lines changed: 44 additions & 1 deletion

File tree

‎apps/server/src/git/GitWorkflowService.test.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { assert, describe, expect, it, vi } from "@effect/vitest";
2+
import * as DateTime from "effect/DateTime";
23
import * as Effect from "effect/Effect";
34
import * as Layer from "effect/Layer";
5+
import * as Option from "effect/Option";
46

57
import { VcsRepositoryDetectionError } from "@t3tools/contracts";
68

@@ -24,6 +26,35 @@ function makeLayer(input: {
2426
}
2527

2628
describe("GitWorkflowService", () => {
29+
it.effect("reports a non-Git VCS repository as not a Git repository", () =>
30+
Effect.gen(function* () {
31+
const workflow = yield* GitWorkflowService.GitWorkflowService;
32+
const isRepository = yield* workflow.isRepository("/jj-repo");
33+
34+
assert.equal(isRepository, false);
35+
}).pipe(
36+
Effect.provide(
37+
makeLayer({
38+
detect: () =>
39+
Effect.succeed({
40+
kind: "jj",
41+
repository: {
42+
kind: "jj",
43+
rootPath: "/jj-repo",
44+
metadataPath: "/jj-repo/.jj",
45+
freshness: {
46+
source: "live-local",
47+
observedAt: DateTime.makeUnsafe("2026-01-01T00:00:00.000Z"),
48+
expiresAt: Option.none(),
49+
},
50+
},
51+
driver: {} as VcsDriverRegistry.VcsDriverHandle["driver"],
52+
}),
53+
}),
54+
),
55+
),
56+
);
57+
2758
it.effect("returns an empty local status when no VCS repository is detected", () =>
2859
Effect.gen(function* () {
2960
const workflow = yield* GitWorkflowService.GitWorkflowService;

‎apps/server/src/git/GitWorkflowService.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,19 @@ export const make = Effect.gen(function* () {
267267
ensureGit(operation, input.cwd).pipe(Effect.andThen(run(input)));
268268

269269
return GitWorkflowService.of({
270-
isRepository: (cwd) => detectGitRepositoryForStatus("GitWorkflowService.isRepository", cwd),
270+
isRepository: (cwd) =>
271+
registry.detect({ cwd }).pipe(
272+
Effect.map((handle) => handle?.kind === "git"),
273+
Effect.mapError(
274+
(cause) =>
275+
new GitManagerError({
276+
operation: "GitWorkflowService.isRepository",
277+
cwd,
278+
detail: "Failed to detect a VCS repository for this Git workflow.",
279+
cause,
280+
}),
281+
),
282+
),
271283
hasCommit: (input) =>
272284
ensureGitCommand("GitWorkflowService.hasCommit", input.cwd).pipe(
273285
Effect.andThen(

0 commit comments

Comments
 (0)