Fix resolveCurrentUpstream to handle slashed remote names

cursoragent · juliusmarminge · cursoragent · commit 3b47f0baab80 · 2026-03-10T21:34:26.000Z
Use 'git config branch.&lt;branch&gt;.remote' to resolve the remote name
instead of splitting the upstream ref on the first '/'. This correctly
handles remotes with slashes in their names (e.g., 'my-org/upstream')
where the old heuristic would parse 'my-org/upstream/feature' as
remoteName='my-org' and upstreamBranch='upstream/feature'.

Co-authored-by: Julius Marminge &lt;juliusmarminge@users.noreply.github.com&gt;
diff --git a/apps/server/src/git/Layers/GitCore.ts b/apps/server/src/git/Layers/GitCore.ts
@@ -334,13 +334,24 @@ const makeGitCore = Effect.gen(function* () {
         return null;
       }
 
-      const separatorIndex = upstreamRef.indexOf("/");
-      if (separatorIndex <= 0) {
+      const currentBranch = yield* runGitStdout(
+        "GitCore.resolveCurrentUpstream.branch",
+        cwd,
+        ["rev-parse", "--abbrev-ref", "HEAD"],
+        true,
+      ).pipe(Effect.map((stdout) => stdout.trim()));
+
+      const remoteName = yield* readConfigValue(cwd, `branch.${currentBranch}.remote`);
+      if (!remoteName) {
+        return null;
+      }
+
+      const prefix = `${remoteName}/`;
+      if (!upstreamRef.startsWith(prefix)) {
         return null;
       }
-      const remoteName = upstreamRef.slice(0, separatorIndex);
-      const upstreamBranch = upstreamRef.slice(separatorIndex + 1);
-      if (remoteName.length === 0 || upstreamBranch.length === 0) {
+      const upstreamBranch = upstreamRef.slice(prefix.length);
+      if (upstreamBranch.length === 0) {
         return null;
       }
 
