@@ -1196,11 +1196,11 @@ describe("pullCurrentBranch", () => {
           Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
         );
 
-        const moving = yield* (
+        const move =
           subcommand === "pull"
-            ? driver.pullCurrentBranch(cwd)
-            : driver.refreshCheckedOutBranch({ cwd, targetCommit: remoteHead })
-        ).pipe(Effect.forkChild({ startImmediately: true }));
+            ? Effect.asVoid(driver.pullCurrentBranch(cwd))
+            : Effect.asVoid(driver.refreshCheckedOutBranch({ cwd, targetCommit: remoteHead }));
+        const moving = yield* move.pipe(Effect.forkChild({ startImmediately: true }));
         yield* Deferred.await(checkoutStarted);
         yield* TestClock.adjust("60 seconds");
         yield* Deferred.succeed(releaseCheckout, undefined);
 
@@ -2984,8 +2984,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     // After a successful pull, HEAD before and after decides the result, so its output is not
     // needed. A large fast-forward's diffstat can exceed the output cap, which must not fail a
     // pull Git applied.
+    // A deadline would kill git mid-checkout (e.g. a slow LFS smudge) and strand a half-updated tree.
     const options = {
-      timeoutMs: 30_000,
+      timeoutMs: null,
       appendTruncationMarker: true,
       allowNonZeroExit: true,
     };
@@ -4773,7 +4774,8 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
           ? ["merge", "--ff-only", input.targetCommit]
           : ["reset", "--merge", input.targetCommit],
         {
-          timeoutMs: 30_000,
+          // Killing a slow checkout partway through strands a half-updated working tree.
+          timeoutMs: null,
           fallbackErrorDetail: "git failed to move the checkout onto the pull request head",
         },
       );