Repository navigation
fix(mobile): push clean default branches without a new commit - #40538
juliusmarminge merged 5 commits into
Conversation
Co-authored-by: GPT 6.2 Sol <codex@openai.com>
Co-authored-by: GPT 6.2 Sol <codex@openai.com>
Co-authored-by: GPT 6.2 Sol <codex@openai.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
No actionable comments were generated in the recent review. Walkthrough
Merge Risk:
|
EvidenceAndroid Pixel 9, API 36, 1080×2424, light theme on both sides. With clean main tracking origin/main and one unpushed commit, open a local-mode thread and choose Git controls → Push → Feature branch & continue. Repeat with branch.autoSetupMerge=always.
Seed driver · Interaction driver · Git inspection driver Base Git state · Head Git state. Both head fixtures published feature/update at the existing local commit without adding a commit. |
The mobile Push shortcut asked for a new commit when a clean default branch already had local commits ready to push. It now pushes those commits from the new feature branch, even when Git automatically sets the local default branch as its upstream.
Fixes #40537
Related: #32816, #16758
Reproduction on main
Commit db9efc5cf0 (main). The confirmation closes and Git reports that it cannot create a feature branch because there are no changes to commit. No branch is created or pushed. The cause is at
apps/mobile/src/features/threads/ThreadGitControls.tsx:241. Followed the steps under Evidence in the app on Pixel_9_API_37 (Android 17.0): Choosing “Feature branch & continue” closed the confirmation and showed a “Git action failed” banner. Git rejected the action because there were no changes to commit, and main remained one commit ahead of origin/main with no feature branch created or pushed.Evidence
Environment: Pixel_9_API_37, Android 17.0, Android Emulator on Linux x64
Steps:
Proven: the bug shows on main at db9efc5cf0 and no longer shows on head 77058128a9.
Not shown:
Tests
pnpm exec vp test run packages/client-runtime/src/state/gitActions.test.tspassed on head.pnpm exec vp run check:changedpassed on head.Not in this change
Who did the work
Made in T3 Code by GPT 6.2 Sol and Claude Opus 5.5