Skip stash pop when stash push creates no entry

Author: Marve10s

apps/server/src/git/Layers/GitCore.test.ts

@@ -1655,6 +1655,29 @@ it.layer(TestLayer)("git integration", (it) => {
       }),
     );
 
+    it.effect("skips stash pop when stash push creates no entry", () =>
+      Effect.gen(function* () {
+        const tmp = yield* makeTmpDir();
+        const { initialBranch } = yield* initRepoWithCommit(tmp);
+        const core = yield* GitCore;
+
+        yield* core.createBranch({ cwd: tmp, branch: "feature" });
+        yield* core.checkoutBranch({ cwd: tmp, branch: "feature" });
+        yield* writeTextFile(path.join(tmp, "feature.txt"), "feature content\n");
+        yield* git(tmp, ["add", "."]);
+        yield* git(tmp, ["commit", "-m", "add feature file"]);
+        yield* core.checkoutBranch({ cwd: tmp, branch: initialBranch });
+
+        yield* core.stashAndCheckout({ cwd: tmp, branch: "feature" });
+
+        const branches = yield* core.listBranches({ cwd: tmp });
+        expect(branches.branches.find((b) => b.current)!.name).toBe("feature");
+
+        const stashList = yield* git(tmp, ["stash", "list"]);
+        expect(stashList.trim()).toBe("");
+      }),
+    );
+
     it.effect("includes descriptive stash message", () =>
       Effect.gen(function* () {
         const tmp = yield* makeTmpDir();

apps/server/src/git/Layers/GitCore.ts

@@ -2243,13 +2243,20 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
             { timeoutMs: 10_000, allowNonZeroExit: true },
           );
         });
+      const readStashList = () =>
+        runGitStdout("GitCore.stashAndCheckout.stashList", input.cwd, ["stash", "list"]).pipe(
+          Effect.map((stdout) => stdout.trim()),
+        );
+
+      const stashListBefore = yield* readStashList();
 
       yield* executeGit(
         "GitCore.stashAndCheckout.stash",
         input.cwd,
         ["stash", "push", "-u", "-m", `t3code: stash before switching to ${input.branch}`],
         { timeoutMs: 15_000, fallbackErrorMessage: "git stash failed" },
       );
+      const stashEntryCreated = (yield* readStashList()) !== stashListBefore;
 
       const checkoutExit = yield* Effect.exit(
         checkoutBranch(input).pipe(
@@ -2266,6 +2273,10 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
         ),
       );
       if (Exit.isFailure(checkoutExit)) {
+        if (!stashEntryCreated) {
+          return yield* Effect.failCause(checkoutExit.cause);
+        }
+
         const restoreResult = yield* executeGit(
           "GitCore.stashAndCheckout.restoreOriginalBranch",
           input.cwd,
@@ -2286,6 +2297,10 @@ export const makeGitCore = Effect.fn("makeGitCore")(function* (options?: {
         return yield* Effect.failCause(checkoutExit.cause);
       }
 
+      if (!stashEntryCreated) {
+        return;
+      }
+
       const popResult = yield* executeGit(
         "GitCore.stashAndCheckout.stashPop",
         input.cwd,