rasterstate/fj
rasterstate/fj
Watch
8
0
Fork
You've already forked fj
 0
Code Issues 27 Pull requests Releases 8 Activity Actions

Add fast-forward-only PR merge style #267

Merged
stephen merged 1 commit from pr-merge-fast-forward-only into main 2026-09-10 16:16:06 +00:00
Conversation 0 Commits 1 Files changed 9 +262 -18
stephen commented 2026-09-10 15:44:51 +00:00
Owner
Copy link

fjord-platform can only promote develop to main safely with Forgejo's fast-forward-only merge style, but fj pr merge could not request it. The API accepts Do: fast-forward-only, so this wires that style through the existing merge path.

What changed

  • Adds pr merge style fast-forward-only and maps it to Do: fast-forward-only.
  • Accepts default_merge_style: fast-forward-only and reads allow_fast_forward_only_merge for policy diagnostics.
  • Omits merge title and message fields for ff-only, and rejects explicit title/message locally because no merge commit is created.
  • Reports a non-fast-forward rejection as a branch that must be rebased onto the base and re-run after CI.
  • Documents the new style in the gh to fj mapping and records the API and verification evidence in REPORT-fj-fastforward.md.

Testing

env RUSTC_WRAPPER= cargo test fast_forward_only; env RUSTC_WRAPPER= cargo test merge_style; env RUSTC_WRAPPER= cargo run -- pr merge --help; local git ff-only positive and negative proof; env RUSTC_WRAPPER= hooks/pre-push.

fjord-platform can only promote develop to main safely with Forgejo's fast-forward-only merge style, but fj pr merge could not request it. The API accepts Do: fast-forward-only, so this wires that style through the existing merge path. ## What changed - Adds pr merge style fast-forward-only and maps it to Do: fast-forward-only. - Accepts default_merge_style: fast-forward-only and reads allow_fast_forward_only_merge for policy diagnostics. - Omits merge title and message fields for ff-only, and rejects explicit title/message locally because no merge commit is created. - Reports a non-fast-forward rejection as a branch that must be rebased onto the base and re-run after CI. - Documents the new style in the gh to fj mapping and records the API and verification evidence in REPORT-fj-fastforward.md. ## Testing env RUSTC_WRAPPER= cargo test fast_forward_only; env RUSTC_WRAPPER= cargo test merge_style; env RUSTC_WRAPPER= cargo run -- pr merge --help; local git ff-only positive and negative proof; env RUSTC_WRAPPER= hooks/pre-push.
Add fast-forward-only PR merge style
All checks were successful
ci / check (pull_request) Successful in 11m26s
Details
ci / live-e2e (pull_request) Successful in 2m10s
Details
ci / coverage (pull_request) Successful in 3m0s
Details
bac5339a8a
stephen deleted branch pr-merge-fast-forward-only 2026-09-10 16:16:06 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backlog
Accepted but not scheduled

  
blocked
Blocked or stalled waiting on external progress

  
converted
Converted into tracked work

  
forseti:changes-requested
Forseti review found unaddressed findings; cleared on a clean re-review at the current head.

  
opportunity
Potential product or business opportunity

  
p1
Priority 1

  
p2
Priority 2

  
p3
Priority 3

  
parked
Paused intentionally until later

No labels
backlog
blocked
converted
forseti:changes-requested
opportunity
p1
p2
p3
parked
Milestone
Clear milestone
No items
No milestone
Assignees
Clear assignees
No assignees
1 participant
Notifications
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
rasterstate/fj!267
No description provided.