code/cl8y-dex-terraclassic

Fork 0

fix(git): pre-push rejects merging main into feature branches after #1282 Co-authored-by #1286

New issue

Closed

opened 2026-09-21 04:03:08 +00:00 by PlasticDigits · 2 comments

PlasticDigits commented

2026-09-21 04:03:08 +00:00

Owner

Summary

ad2d2493 on main (ADR 0006, from PR #1282) has a Co-authored-by: Cursor <cursoragent@cursor.com> trailer. Local .githooks/pre-push scans remote_oid..local_oid of the feature branch. Merging origin/main into a PR branch then pushing re-introduces that commit in the push range, so the hook rejects the push even though the commit is already on main.

This blocked client-side PR updates during the #1270/#1281/#1278 land. Workaround used: Forgejo POST /pulls/{n}/update (server-side merge of main into the head). Do not rewrite main. Do not --no-verify.

Remaining

Change pre-push (and any similar check) to ignore commits already reachable from origin/main.
Leave ad2d2493 on main (no history rewrite).

Acceptance criteria

git merge origin/main on a feature branch plus git push succeeds when the only policy-violating commit is already on origin/main.
New commits with email / Co-authored-by trailers still fail.

## Summary `ad2d2493` on `main` (ADR 0006, from PR #1282) has a `Co-authored-by: Cursor <cursoragent@cursor.com>` trailer. Local `.githooks/pre-push` scans `remote_oid..local_oid` of the **feature branch**. Merging `origin/main` into a PR branch then pushing re-introduces that commit in the push range, so the hook rejects the push even though the commit is already on `main`. This blocked client-side PR updates during the #1270/#1281/#1278 land. Workaround used: Forgejo `POST /pulls/{n}/update` (server-side merge of `main` into the head). Do not rewrite `main`. Do not `--no-verify`. ## Remaining - Change pre-push (and any similar check) to ignore commits already reachable from `origin/main`. - Leave `ad2d2493` on `main` (no history rewrite). ## Acceptance criteria - [ ] `git merge origin/main` on a feature branch plus `git push` succeeds when the only policy-violating commit is already on `origin/main`. - [ ] New commits with email / Co-authored-by trailers still fail.

PlasticDigits referenced this issue

2026-09-21 04:03:19 +00:00

fix(router): declared hybrid split must equal hop offer on execute #1280

PlasticDigits added the

ready

labels

2026-09-21 04:25:29 +00:00

PlasticDigits commented

2026-09-21 04:25:42 +00:00

Author

Owner

cl8y-agent-control: queued implement job a33608ca-c230-4530-b55e-4ec04d84eb7d (not executed; no Hetzner VM).

cl8y-agent-control: queued `implement` job `a33608ca-c230-4530-b55e-4ec04d84eb7d` (not executed; no Hetzner VM).

PlasticDigits removed the

ready

label

2026-09-21 04:25:46 +00:00

PlasticDigits referenced this issue from a commit

2026-09-21 04:27:50 +00:00

fix(git): skip pre-push policy check for commits on origin/main

PlasticDigits referenced this issue from a pull request that will close it,

2026-09-21 04:27:56 +00:00

fix(git): pre-push rejects merging main into feature branches after #1282 Co-authored-by #1287

PlasticDigits removed the

ready

label

2026-09-21 04:31:02 +00:00

PlasticDigits referenced this issue from a commit

2026-09-21 04:41:55 +00:00

docs(git): verify-issue-1287 playbook and regression target

PlasticDigits closed this issue

2026-09-21 05:18:33 +00:00

PlasticDigits referenced this issue

2026-09-21 05:42:25 +00:00

Post-merge leftover after PRs 1287-1298 #1300

PlasticDigits commented

2026-09-21 05:44:05 +00:00

Author

Owner

Fixed via PR #1287 (pre-push skips commits already on origin/main). Stacked with later PRs' unpublished-commit range. Hook verify residue from that stack is PR #1301.

Leftover ops: #1300

Fixed via PR #1287 (pre-push skips commits already on origin/main). Stacked with later PRs' unpublished-commit range. Hook verify residue from that stack is PR #1301. Leftover ops: https://git.cl8y.com/code/cl8y-dex-terraclassic/issues/1300