Fix branch-off worktree upstream tracking (#1002)

packages/server/src/utils/checkout-git.test.ts

@@ -1269,6 +1269,14 @@ const x = 1;
     await pushCurrentBranch(repoDir);
 
     execFileSync("git", ["--git-dir", remoteDir, "show-ref", "--verify", "refs/heads/feature"]);
+    const upstream = execFileSync(
+      "git",
+      ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
+      { cwd: repoDir },
+    )
+      .toString()
+      .trim();
+    expect(upstream).toBe("origin/feature");
   });
 
   it("lists merged local and remote branch suggestions with provenance", async () => {

packages/server/src/utils/worktree.ts

@@ -1277,7 +1277,7 @@ async function resolveWorktreeSourcePlan({
       return {
         branchName: newBranchName,
         metadataBaseRefName: normalizedBaseBranch,
-        addArguments: ["-b", newBranchName, base],
+        addArguments: ["-b", newBranchName, "--no-track", base],
       };
     }
     case "checkout-branch": {