@@ -7369,7 +7369,7 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
           cwd,
           null,
         );
-        assert.deepInclude(localUpstreamGone, { upstreamBranch: "origin/push" });
+        assert.deepInclude(localUpstreamGone, { upstreamBranch: "origin/feature/push" });
 
         yield* git(cwd, ["push", "fork", "HEAD:refs/heads/release"]);
         yield* git(cwd, ["branch", "-u", "fork/release"]);
 
@@ -2872,7 +2872,10 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       }
       const remoteName = yield* resolvePushRemoteName(cwd, branch, goneUpstream?.remoteName);
       if (!remoteName) return null;
-      const branchName = goneUpstream?.branchName ?? (yield* resolvePublishBranchName(cwd, branch));
+      // A gone local upstream still gets the full local name, as below.
+      const branchName =
+        goneUpstream?.branchName ??
+        (configuredRemoteName === "." ? branch : yield* resolvePublishBranchName(cwd, branch));
       return { remoteName, branchName, publishes: true, upstream: goneBaseUpstream };
     }
Original file line number	Diff line number	Diff line change
`@@ -2872,7 +2872,10 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*`
`2872`	`2872`	`}`
`2873`	`2873`	`const remoteName = yield* resolvePushRemoteName(cwd, branch, goneUpstream?.remoteName);`
`2874`	`2874`	`if (!remoteName) return null;`
`2875`		`- const branchName = goneUpstream?.branchName ?? (yield* resolvePublishBranchName(cwd, branch));`
	`2875`	`+ // A gone local upstream still gets the full local name, as below.`
	`2876`	`+ const branchName =`
	`2877`	`+ goneUpstream?.branchName ??`
	`2878`	`+ (configuredRemoteName === "." ? branch : yield* resolvePublishBranchName(cwd, branch));`
`2876`	`2879`	`return { remoteName, branchName, publishes: true, upstream: goneBaseUpstream };`
`2877`	`2880`	`}`
`2878`	`2881`