Skip to content

fix: enable merge commits during backtrack by explicitly setting required_linear_history in branch protection payload #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petesramek merged 1 commit into from
Apr 4, 2026
Merged

fix: enable merge commits during backtrack by explicitly setting required_linear_history in branch protection payload #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/actions/github/branch-protection/lock/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ inputs:
description: 'When true, sets required_pull_request_reviews to null (removes PR review requirement). Use temporarily before automated merges so the merge API is not blocked. When false (default), PR reviews are required as configured.'
required: false
default: 'false'
required-linear-history:
description: 'When true, enforces linear history (no merge commits). When false (default), merge commits are allowed. Set to false before automated merges that create merge commits.'
required: false
default: 'false'

runs:
using: composite
Expand All @@ -48,6 +52,7 @@ runs:
--argjson enforce_admins "$ENFORCE_ADMINS" \
--argjson lock_branch '${{ inputs.lock-branch }}' \
--argjson skip_reviews '${{ inputs.skip-pull-request-reviews }}' \
--argjson required_linear_history '${{ inputs.required-linear-history }}' \
'{
"required_status_checks": null,
"enforce_admins": $enforce_admins,
Expand All @@ -59,7 +64,8 @@ runs:
"restrictions": null,
"allow_force_pushes": false,
"allow_deletions": false,
"lock_branch": $lock_branch
"lock_branch": $lock_branch,
"required_linear_history": $required_linear_history
}')

if ! echo "$PAYLOAD" | gh api --method PUT /repos/${{ github.repository }}/branches/${{ inputs.branch }}/protection --input -; then
Expand Down
Loading