@@ -5,6 +5,7 @@ import { expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
+import { vi } from "vite-plus/test";
 
 import * as ProcessRunner from "../processRunner.ts";
 import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts";
@@ -358,17 +359,8 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
       yield* git(other, ["init"]);
       yield* git(other, ["config", "remote.upstream.gh-resolved", "base"]);
 
-      const previousGitDir = process.env.GIT_DIR;
-      yield* Effect.acquireRelease(
-        Effect.sync(() => {
-          process.env.GIT_DIR = path.join(other, ".git");
-        }),
-        () =>
-          Effect.sync(() => {
-            if (previousGitDir === undefined) delete process.env.GIT_DIR;
-            else process.env.GIT_DIR = previousGitDir;
-          }),
-      );
+      vi.stubEnv("GIT_DIR", path.join(other, ".git"));
+      yield* Effect.addFinalizer(() => Effect.sync(() => vi.unstubAllEnvs()));
 
       const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
       const identity = yield* resolver.resolve(cwd);
 
@@ -242,11 +242,12 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
   cacheKey: RepositoryIdentityCacheKey,
 ): Effect.fn.Return<RepositoryIdentity | null, never, ProcessRunner.ProcessRunner> {
   const processRunner = yield* ProcessRunner.ProcessRunner;
+  const env = gitEnv(yield* HostProcess.Platform);
   const remoteResult = yield* processRunner
     .run({
       command: "git",
       args: ["-C", cacheKey.rootPath, ...(cacheKey.isBare ? ["--git-dir=."] : []), "remote", "-v"],
-      env: gitEnv(yield* HostProcess.Platform),
+      env,
       timeoutBehavior: "timedOutResult",
     })
     .pipe(Effect.option);
@@ -265,7 +266,7 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
         "--get-regexp",
         "^remote\\..*\\.gh-resolved$",
       ],
-      env: explicitBareRepositoryEnv(process.env, yield* HostProcess.Platform),
+      env,
       timeoutBehavior: "timedOutResult",
     })
     .pipe(Effect.option);