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

Merged

PlasticDigits merged 2 commits from issue/1286 into main 2026-09-21 05:18:33 +00:00

Conversation 3 Commits 2 Files changed 10 +182 -5

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

Owner

Copy link

Fixes #1287
Fixes #1286

Summary

pre-push scanned every commit in the push range, including commits already on origin/main. After #1282, ad2d2493 on main carries a Co-authored-by trailer; merging origin/main into a PR branch then pushing re-scanned that commit and blocked the push.

Skip policy validation for commits already reachable from origin/main (via the push remote’s main). New branch-only violations still fail.

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.

Validation

• make verify-issue-1287 (alias for make test-commit-msg-hook, includes scripts/test-pre-push-commit-policy.sh)

Gaps

• None for scoped fix; verify-commit-messages.sh still scans explicit ranges and is unchanged (not used for push-range semantics).

Fixes #1287 Fixes #1286 ## Summary `pre-push` scanned every commit in the push range, including commits already on `origin/main`. After #1282, `ad2d2493` on main carries a `Co-authored-by` trailer; merging `origin/main` into a PR branch then pushing re-scanned that commit and blocked the push. Skip policy validation for commits already reachable from `origin/main` (via the push remote’s `main`). New branch-only violations still fail. ## Acceptance criteria - [x] `git merge origin/main` on a feature branch plus `git push` succeeds when the only policy-violating commit is already on `origin/main`. - [x] New commits with email / Co-authored-by trailers still fail. ## Validation - `make verify-issue-1287` (alias for `make test-commit-msg-hook`, includes `scripts/test-pre-push-commit-policy.sh`) ## Gaps - None for scoped fix; `verify-commit-messages.sh` still scans explicit ranges and is unchanged (not used for push-range semantics).

PlasticDigits added 1 commit 2026-09-21 04:27:56 +00:00

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

Merging main into a feature branch re-scans historical main commits in the
push range; ignore bodies already on the integration branch (#1286).

PlasticDigits requested review from maintainers 2026-09-21 04:27:56 +00:00

PlasticDigits commented 2026-09-21 04:28:00 +00:00

Author

Owner

Copy link

drain skip: no occupying job for rebase/fix-pr/CI-wait; remaining continue

drain skip: no occupying job for rebase/fix-pr/CI-wait; remaining continue

PlasticDigits added the

ready

ready

labels 2026-09-21 04:33:08 +00:00

PlasticDigits commented 2026-09-21 04:33:20 +00:00

Author

Owner

Copy link

cl8y-agent-control: queued implement job a3e8bcb5-39fc-44dd-a26a-88f9d58ca290 (not executed; no Hetzner VM).

cl8y-agent-control: queued `implement` job `a3e8bcb5-39fc-44dd-a26a-88f9d58ca290` (not executed; no Hetzner VM).

PlasticDigits removed the

ready

ready

labels 2026-09-21 04:39:39 +00:00

PlasticDigits referenced this pull request from a commit 2026-09-21 04:41:55 +00:00

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

PlasticDigits added 1 commit 2026-09-21 04:41:55 +00:00

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

Document pre-push origin/main skip (#1287 / #1286) for agents and testing.md.

PlasticDigits removed review request for maintainers 2026-09-21 04:50:15 +00:00

PlasticDigits merged commit 2935cab5e6 into main 2026-09-21 05:18:33 +00:00

PlasticDigits deleted branch issue/1286 2026-09-21 05:18:33 +00:00

PlasticDigits referenced this pull request from a commit 2026-09-21 05:18:33 +00:00

Merge pull request 'fix(git): pre-push skips origin/main commits after #1282' (#1287) from issue/1286

PlasticDigits referenced this pull request 2026-09-21 05:42:25 +00:00

Post-merge leftover after PRs 1287-1298 #1300

PlasticDigits commented 2026-09-21 05:44:03 +00:00

Author

Owner

Copy link

Merged as PR #1287 onto origin/main.

Follow-up: make verify-issue-1287 failed on the stacked main because a leftover echo FAIL; exit 1 survived the #1291 merge into scripts/test-commit-msg-hook.sh. Fixed in PR #1301. Combined pre-push keeps origin/main skip plus --not --remotes for new branches.

Leftover ops: #1300

Merged as PR #1287 onto origin/main. Follow-up: `make verify-issue-1287` failed on the stacked main because a leftover `echo FAIL; exit 1` survived the #1291 merge into `scripts/test-commit-msg-hook.sh`. Fixed in PR #1301. Combined pre-push keeps origin/main skip plus `--not --remotes` for new branches. Leftover ops: https://git.cl8y.com/code/cl8y-dex-terraclassic/issues/1300

PlasticDigits referenced this pull request 2026-09-21 05:44:05 +00:00

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

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

agent:fix_bugfix

  

agent:fix_conflicts

  

agent:fix_security

  

agent:gap_analysis

  

agent:implement

  

agent:implement

Queue implement gate

  

agent:implement

Queue implement gate

  

agent:open_issues

  

agent:ready

  

agent:research

  

agent:security_audit

  

agent:verify

  

architecture

Architecture

  

backend

API and services

  

blocker:hybrid

Blocks hybrid launch

  

blocker:launch

Blocks launch

  

blocker:limit-orders

Blocks limits launch

  

blocker:v2

Blocks v2

  

block:log_only

  

block:security

  

bug

  

ci

  

contracts

Smart contracts

  

correctness

  

deploy

  

dev

  

devops

  

docs

  

documentation

  

duplicate

  

e2e

  

enhancement

  

epic

Epic

  

feature

  

frontend

  

functional-completion

Functional

  

gas

  

good first issue

  

governance

  

help wanted

  

high-risk

  

hooks

  

hybrid

Hybrid swaps

  

indexer

Indexer

  

infra

CI/CD

  

infrastructure

  

integrators

  

invalid

  

launch-blocker

  

limit-orders

Limit orders

  

localnet

  

localterra

  

low priority

  

missing-implementation

Implementation

  

needs-design

Design decision required

  

ops

  

performance

  

priority

high

  

priority

medium

  

product

  

qa

  

QA

  

question

  

ready

Definition of Ready

  

ready

Definition of Ready

  

research

  

scripts

  

security

Security

  

security-hardening

Security hardening

  

smartcontracts

  

tech-debt

  

testing

Testing

  

ux

  

UX

  

v2

Pool-only swaps

  

verification

  

wontfix

No labels

agent:fix_bugfix

agent:fix_conflicts

agent:fix_security

agent:gap_analysis

agent:implement

agent:implement

agent:implement

agent:open_issues

agent:ready

agent:research

agent:security_audit

agent:verify

architecture

backend

blocker:hybrid

blocker:launch

blocker:limit-orders

blocker:v2

block:log_only

block:security

bug

ci

contracts

correctness

deploy

dev

devops

docs

documentation

duplicate

e2e

enhancement

epic

feature

frontend

functional-completion

gas

good first issue

governance

help wanted

high-risk

hooks

hybrid

indexer

infra

infrastructure

integrators

invalid

launch-blocker

limit-orders

localnet

localterra

low priority

missing-implementation

needs-design

ops

performance

priority

high

priority

medium

product

qa

QA

question

ready

ready

research

scripts

security

security-hardening

smartcontracts

tech-debt

testing

ux

UX

v2

verification

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

code/cl8y-dex-terraclassic!1287

No description provided.