Repository navigation
fix(server): a branch prefixed with another remote's name publishes under its full name - #40877
Conversation
…er their full name
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
…her-remote-prefix
…mote's prefix Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
EvidencePublish 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.
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. Not shown:
|
…nder its full name (pingdotgg#40877) Co-authored-by: Abhiram-745 <237478249+Abhiram-745@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
**v0.1.12-nightly.20261122.5111** · 30 changes from 10 contributors - **Multi-file diffs.** Open diff now shows every file in a multi-file Codex patch. - **Mixed-content paste.** Pasting a message with text and a picture now keeps both. - **Queued attachments.** Edit a queued message without losing its image or file attachment chips. - **Pull request checks.** Agents watching a pull request can recognize checks that already passed instead of waiting indefinitely. - **Notebook outputs.** Saved HTML outputs now appear when you scroll them into view. ### Plus 24 more bug fixes and performance improvements. <details> <summary>Full changelog</summary> ## What's Changed * perf(mobile): keep image bytes outside draft JSON by @t3dotgg in pingdotgg/t3code#9727 * fix(server): watch_pull_request says when checks already passed by @juliusmarminge in pingdotgg/t3code#40866 * fix(codex): Open diff shows every file of a multi-file patch by @Abhiram-745 in pingdotgg/t3code#40874 * fix(server): ACP startup gives up when the agent never answers the handshake by @juliusmarminge in pingdotgg/t3code#40864 * fix(server): a branch prefixed with another remote's name publishes under its full name by @Abhiram-745 in pingdotgg/t3code#40877 * fix(server): list open delegated tasks when task_status or task_cancel finds no match by @Project516 in pingdotgg/t3code#40886 * fix(gitlab): find merge requests opened from a fork by @Abhiram-745 in pingdotgg/t3code#40894 * fix(web): pasting a chat message with text and a picture keeps both by @juliusmarminge in pingdotgg/t3code#40909 * fix(antigravity): bound silent post-settle background command holds by @Lokkuchakreshkumar in pingdotgg/t3code#40858 * fix(desktop): WSL is not offered or started when only the Windows install stub exists by @juliusmarminge in pingdotgg/t3code#40918 * fix(server): idle /ws connections behind a reverse proxy no longer drop every 60s by @juliusmarminge in pingdotgg/t3code#40932 * fix(server): thread reads no longer attribute T3 Code's compact-before-send /compact to the user by @juliusmarminge in pingdotgg/t3code#40934 * fix(web,mobile): @-file mentions show by name in message previews, not as raw links by @tiliakoos in pingdotgg/t3code#40924 * fix(web): tool calls stay grouped after a usage-limit pause again by @matthew-waters in pingdotgg/t3code#40905 * fix(server): t3 doctor no longer reports a database just under 1 GiB as "1024.0 MiB" by @tiliakoos in pingdotgg/t3code#40952 * fix(web): show clone failure after progress is dismissed by @StiensWout in pingdotgg/t3code#40951 * Invalidate pending theme imports when a replacement is too large by @StiensWout in pingdotgg/t3code#40965 * fix(mobile): show linked thread history page errors by @StiensWout in pingdotgg/t3code#40973 * fix(client-runtime): skip waiting for lower-priority linked addresses by @StiensWout in pingdotgg/t3code#40989 * fix(web): navigate Excel sheets from the focused tab by @StiensWout in pingdotgg/t3code#41008 * fix(mobile): bound app-owned composer attachment filenames by @StiensWout in pingdotgg/t3code#40991 * fix(web): prioritize visible saved notebook outputs by @StiensWout in pingdotgg/t3code#40998 * fix(web): editing a queued message keeps its attachment chips resolved by @smirea in pingdotgg/t3code#40945 * fix(server): unlinking an environment ends its session on the other machine by @juliusmarminge in pingdotgg/t3code#41005 * fix(mobile): scope Git result banners to their originating thread by @StiensWout in pingdotgg/t3code#41015 * fix(web): keep the conversation when a pairing tab closes by @StiensWout in pingdotgg/t3code#41025 * fix: restart linked thread reads when trying again by @StiensWout in pingdotgg/t3code#41020 * fix(client-runtime): count ambiguous projects in chat file links by @StiensWout in pingdotgg/t3code#40986 * fix(mobile): keep media actions on each sent image page by @StiensWout in pingdotgg/t3code#41018 * perf(server): a run's provider turn lookup is linear, not quadratic by @navidnadali in pingdotgg/t3code#38791 ## New Contributors * @Lokkuchakreshkumar made their first contribution in pingdotgg/t3code#40858 * @matthew-waters made their first contribution in pingdotgg/t3code#40905 **Full Changelog**: pingdotgg/t3code@v0.1.12-nightly.20261122.5098...v0.1.12-nightly.20261122.5111 </details> Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.1.12-nightly.20261122.5111


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:originand a second remote named after a GitHub login, sayalice(your own fork remote, or one T3 added when you checked out a fork PR). Branches named<login>/<topic>are a common convention.alice/fixwith no upstream, commit, and click Push (or Commit & push / Create PR).git push origin HEAD:refs/heads/fixand recordsorigin/fixas the upstream. Expected: it publishesalice/fixto origin. Iffixalready exists on origin and the push fast-forwards it, someone else's branch moves.resolvePublishBranchNameinGitVcsDriverCore.tsdrops a leading<remote>/whenever<remote>is any configured remote, even when the push goes somewhere else. In the steps aboveresolvePushDestinationtakes the no-upstream path,parseRemoteRefWithRemoteNames("alice/fix", ["origin", "alice"])returnsfix, and the push remote falls back toorigin.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 inresolvePushDestination, the publish path for a branch whose upstream is a base, andpushCurrentBranchwith a requested remote. A branch namedorigin/feature/pushpushed tooriginstill publishes asfeature/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
GitVcsDriverCore.test.ts, "publishes a new branch prefixed with another remote's name under its full name", uses real repos with two bare remotes. Onmainit fails withexpected { status: 'pushed', …(3) } to have deep property 'upstreamBranch' of 'origin/alice/fix', but got 'origin/fix'. With the fix it passes and checks thatrefs/heads/alice/fixon origin points at HEAD.it.effect.each(["feature/push", "origin/feature/push"])) still passes.GitVcsDriverCore.test.tsandGitManager.test.tspass (530 tests).vp fmt,vp lintandknip:checkon the changed files are clean, andt3typecheck passes.Code written with Claude Code (Claude Opus 5.5).