The first real upstream release since the subtree landed, and the point of
the whole arrangement. It merged cleanly: 7.1.2 changes about.php,
template.php and version.php, none of which this fork touches, so the patched
installer came through byte-identical and there was nothing to resolve.
Getting there needed two fixes to the tool, both of which only a real release
could have found — the earlier same-version run was a no-op that exercised
none of this.
**The prefix was an absolute path.** `${here#"$repo"/}` assumes the two
strings share a spelling, and on Windows they do not: --show-toplevel answers
"D:/Dev/…" while $PWD is "/d/Dev/…", so the subtraction left the path
untouched and `git subtree merge --prefix` was handed something absolute. The
same bug was fixed in refresh-patches.sh a few commits ago; this is the other
copy of it. Both now ask git via `rev-parse --show-prefix`.
**git-subtree refuses to run in a dirty repository** — any modification
anywhere, not just under the subtree. In a monorepo shared with other work
that is the normal state, so the tool was unusable exactly where it lives.
The merge now happens in a scratch worktree, which is clean by construction,
and comes back as one ordinary merge commit that touches only wordpress/ and
so does not care what else is modified.
Also: a failed run no longer refuses to retry. The import onto the upstream
branch is idempotent now, and the failure message distinguishes "upstream and
the fork changed the same lines" from "the merge could not start", instead of
blaming a conflict for both.
The subtree is in place, so everything that used to fetch and patch core at
build time now just copies it.
tools/build.sh copies wordpress/ — no download, no checksum step,
because there is nothing to fetch and nothing to
trust that is not already in the repository
docker/Dockerfile COPY wordpress/ instead of curl + sha256 + patch;
the build args and the `patch` package are gone
docker-compose.yml no WP_VERSION / WP_URL / WP_SHA256 to keep in step
tools/update-wordpress.sh is rewritten around what the subtree makes
possible. It imports the pristine release onto sirius-press/wordpress-upstream
and then `git subtree merge`s that branch, which three-way merges upstream
against the fork's own commit. A patch either applies with fuzz and hopes or
fails and leaves you re-deriving the change by hand; a merge conflict is
resolved once, in the file, and the next release merges against the
resolution.
patches/ survives as documentation rather than mechanism, and is now
generated: tools/refresh-patches.sh diffs the subtree against the pristine
import and rewrites the directory, with --check for CI. It answers the
question anyone auditing a fork asks first — what exactly did you change
inside WordPress? — in a minute, which `git log wordpress/` cannot, because
that log is mostly upstream imports. Generated documentation stays true; a
hand-maintained record of a core diff drifts, and a stale one is worse than
none because people trust it.
One test change worth noting: the syntax sweep no longer walks all of
wordpress/. It lints the fork's own PHP plus every core file patches/ says
the fork touches, which keeps the suite at seven seconds instead of a minute
while still covering the only core file that can break.
2026-09-21 03:19:28 +02:00
Renamed from patches/0001-setup-wizard-wallet-instead-of-email.patch (Browse further)
