Public: anyone can read this; the crew can change it.
Follow upstream card names the one move a check makes to main, not 'never a push' (#14312) #14324
Check · Review · Land · Live done — Landed and live in production.
A check returns the default branch to the upstream's commit ids when all of its own work already landed upstream, in every mode (docs/features/ follow-an-origin.md). The settings card said 'never a push to main' and 'nothing of yours is rewritten'. Say what happens instead, and pin the returned push event in the test.
shipped production is serving it deploy 02af203
<!-- look-pages 69da66c6c1ae --> Look pages for 69da66c, from the gate:
look pages (inferred): "Looks: /settings" is not a page of app.looks in forge.json; this pull changes src/web/pages/upstream-follow.ts; the forge pictures /settings/crew (src/web/pages/upstream-follow.ts), /settings/grants (src/web/pages/upstream-follow.ts), /preview-admin/sample (src/web/pages/upstream-follow.ts) and 3 more, the pages whose routes import it. A "Looks: <path>" or "No look: <why>" line in a commit message overrides
Thank you, @grokbot: pull #14324 landed in fa2316a11a56.
1 commit by grokbot touched 3 files, landed as a merge, so your commits are ancestors of main and git merge main on your side stays clean.
Nothing changed on the way: it landed as you pushed it.
A check returns the default branch to the upstream's commit ids when all of its own work already landed upstream, in every mode (docs/features/ follow-an-origin.md). The settings card said 'never a push to main' and 'nothing of yours is rewritten'. Say what happens instead, and pin the returned push event in the test.
Try: open a repository's Settings, Follow upstream card, and read the line under the heading Looks: /settings No door: wording only; docs/features/follow-an-origin.md already says this, and the terminal shows no such line
Closes #14312
What. In tell-me mode a check moved
mainoff a local merge commit onto the upstream tip (#14312). That is the documented "returned" settle: it runs in every mode when all of main's own work is already in the upstream tip (docs/features/follow-an-origin.md, pinned by the "with no mode set, work that landed upstream..." test in test/upstream-sync.test.ts). The settings card contradicted it with "never a push to main" and "nothing of yours is rewritten".Change. This takes option (b) from the issue: keep the behavior and fix the copy. The card now says a check moves main only back onto upstream ids once all its own work landed there. If you'd rather take option (a) and gate the returned settle on take-updates, it's a one-line change in
settleOntoFollowed, but that test and the doc would flip with it, so I left that decision to you.Test. test/upstream-follow-history.test.ts: the card no longer claims "never a push" and names the move. test/upstream-sync.test.ts: the landed case now also asserts the push event (
refs/heads/mainold→new,returned: true). Ran upstream-follow-history, upstream-sync, upstream-follow-web, time-element and attention (first-view word budget, crew 724/742): all pass. tsc is clean. The two failures validate flagged (start, crew-early) reran green alone and are unrelated.Validation
validateon69da66c6: flaky in 391s (forge.json check.fast, verbatim, in a scrubbed env).bun install --frozen-lockfile: ok (exit 0, 0s)forge.json check.fast: FLAKY (exit 1, 391s)