Skip to content

fix(server): a branch prefixed with another remote's name publishes under its full name - #40877

Merged
juliusmarminge merged 3 commits into
pingdotgg:mainfrom
Abhiram-745:fix/publish-branch-other-remote-prefix
Nov 22, 2026
Merged

juliusmarminge merged 3 commits into
pingdotgg:mainfrom
Abhiram-745:fix/publish-branch-other-remote-prefix

Conversation

@Abhiram-745

Copy link
Copy Markdown
Contributor

Problem

Pushing a new branch whose name starts with the name of a different remote publishes it under the wrong name on the push remote.

Repro on main:

  1. Have a repo with origin and a second remote named after a GitHub login, say alice (your own fork remote, or one T3 added when you checked out a fork PR). Branches named <login>/<topic> are a common convention.
  2. Create a branch alice/fix with no upstream, commit, and click Push (or Commit & push / Create PR).
  3. T3 runs git push origin HEAD:refs/heads/fix and records origin/fix as the upstream. Expected: it publishes alice/fix to origin. If fix already exists on origin and the push fast-forwards it, someone else's branch moves.

resolvePublishBranchName in GitVcsDriverCore.ts drops a leading <remote>/ whenever <remote> is any configured remote, even when the push goes somewhere else. In the steps above resolvePushDestination takes the no-upstream path, parseRemoteRefWithRemoteNames("alice/fix", ["origin", "alice"]) returns fix, and the push remote falls back to origin.

Change

resolvePublishBranchName(branch, remoteName) now drops the prefix only when it names the remote being pushed to. All three callers pass their destination: the no-upstream publish in resolvePushDestination, the publish path for a branch whose upstream is a base, and pushCurrentBranch with a requested remote. A branch named origin/feature/push pushed to origin still publishes as feature/push, which the existing test covers. The helper no longer lists remotes, so it is a plain function.

Scope

This is a small fix for an obvious bug in one helper, so I didn't open an issue. It follows the rule #33581 set for local-tracking branches, that a branch publishes under its full local name unless that name really is a ref on the destination. #33557 (open) edits the same call sites for a different feature, so expect a textual conflict only.

Verification

  • New test in GitVcsDriverCore.test.ts, "publishes a new branch prefixed with another remote's name under its full name", uses real repos with two bare remotes. On main it fails with expected { status: 'pushed', …(3) } to have deep property 'upstreamBranch' of 'origin/alice/fix', but got 'origin/fix'. With the fix it passes and checks that refs/heads/alice/fix on origin points at HEAD.
  • The existing same-remote case (it.effect.each(["feature/push", "origin/feature/push"])) still passes. GitVcsDriverCore.test.ts and GitManager.test.ts pass (530 tests).
  • vp fmt, vp lint and knip:check on the changed files are clean, and t3 typecheck passes.

Code written with Claude Code (Claude Opus 5.5).

@github-actions github-actions Bot added vouch:unvouched Author is not yet trusted in the VOUCHED list. size:S 10-29 changed lines (additions + deletions). labels Nov 22, 2026
@coderabbitai

coderabbitai Bot commented Nov 22, 2026 •

Copy link
Copy Markdown
Contributor

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

Branch publishing now strips a branch-name prefix only when it matches the push destination remote. A test covers publishing local branch alice/fix to origin when alice is also a configured remote.

Changes: Destination-aware branch publishing

Layer / File(s) Summary
Resolve the published branch name
apps/server/src/vcs/GitVcsDriverCore.ts, apps/server/src/vcs/GitVcsDriverCore.test.ts
Publish destination resolution uses the selected remote when stripping a branch-name prefix. The test checks that publishing alice/fix to origin updates origin/alice/fix to the local HEAD.

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Possibly related PRs

  • pingdotgg/t3code#33581: Both PRs change publish branch-name resolution for branch names that resemble remote prefixes.

Suggested labels: bugfix

Suggested reviewers: saphid, juliusmarminge, stienswout

Merge Risk: Minimal · up to 6c23a

Publishing a new branch such as alice/fix to origin now keeps its full name when alice is a different remote, while a prefix matching the destination remote is still stripped. A regression test covers this. No merge-blocking risk was identified.

Pre-merge checks: Passed 4

Check name Status Explanation
Title check Passed The title names the main change: a branch prefixed with another remote's name now publishes under its full name, and the fix is scoped to the server. It follows the conventional commit form and is spe…
Description check Passed The description follows the template sections: Problem, Change, Scope, and Verification. It explains the bug with reproduction steps and the affected helper. It explains the change and why all three c…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Title check

Explanation

The title names the main change: a branch prefixed with another remote's name now publishes under its full name, and the fix is scoped to the server. It follows the conventional commit form and is specific enough for a teammate scanning history. It is somewhat long at 87 characters, but the length does not hurt clarity.

Full details: Description check

Explanation

The description follows the template sections: Problem, Change, Scope, and Verification. It explains the bug with reproduction steps and the affected helper. It explains the change and why all three callers pass the destination. It gives the scope rationale for not opening an issue. Verification names the new test, the failing and passing results, and the existing same-remote case, and it lists the checks run. It does not contain a model/harness line in the template's form, but it does name Claude Code, and the template asks for the model and harness, so this is covered. The description meets the template requirements.

Finishing Touches

Generate unit tests (beta)

  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Recent review info

Run configuration

Commits

Reviewing files that changed from the base of the PR and between cd88f99 and 6c23a34.

Files selected for processing: 1

  • apps/server/src/vcs/GitVcsDriverCore.ts

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 6 remain after this review.

@juliusmarminge juliusmarminge added the takeover:in-progress A takeover lead is working on this PR label Nov 22, 2026
juliusmarminge and others added 2 commits November 22, 2026 14:26
@juliusmarminge

Copy link
Copy Markdown
Member

Evidence

Publish local alice/fix with no upstream while origin and alice are configured remotes. In a real replay thread, select Git action options → Push. Same Chromium viewport, light theme, and fresh synthetic state on both commits.

Before After
ad2bdc76a5 6c23a34277
Before: pushed to origin/fix After: pushed to origin/alice/fix
Push recording Push recording

Base created refs/heads/fix. Head created refs/heads/alice/fix and recorded origin/alice/fix as upstream. The scenario failed on base and passed on head.

Scenario source

Not shown:

  • Fast-forwarding an existing unrelated origin/fix branch was not exercised; the reproduction started with only main on origin.

@juliusmarminge juliusmarminge added takeover:ready Takeover done; auto-lands when gates pass and removed takeover:in-progress A takeover lead is working on this PR labels Nov 22, 2026
@juliusmarminge
juliusmarminge merged commit 1d02824 into pingdotgg:main Nov 22, 2026
55 checks passed
@juliusmarminge juliusmarminge removed the takeover:ready Takeover done; auto-lands when gates pass label Nov 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:S 10-29 changed lines (additions + deletions). vouch:unvouched Author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants