Skip to content

fix(repository): avoid perpetual merge_commit_* diff when merge commits are disabled #24

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
josmo merged 2 commits into from
Oct 20, 2026
Merged

fix(repository): avoid perpetual merge_commit_* diff when merge commits are disabled #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3720c12
fix(repository): avoid perpetual merge_commit_* diff when merge commi…
josmo Oct 20, 2026
ba8518f
fix: use prek
josmo Oct 20, 2026
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
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

- [ ] PR title follows Conventional Commits (it is linted)
- [ ] `terraform fmt -recursive` is clean
- [ ] `pre-commit run --all-files` passes (docs regenerated if inputs/outputs/resources changed)
- [ ] `prek run --all-files` passes (docs regenerated if inputs/outputs/resources changed)
- [ ] `terraform test` passes for any submodule I changed
- [ ] Breaking input changes are described below (pre-1.0)

Expand Down
8 changes: 6 additions & 2 deletions modules/repository/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ resource "github_repository" "internal" {
allow_rebase_merge = each.value.allow_rebase_merge
allow_squash_merge = each.value.allow_squash_merge
delete_branch_on_merge = each.value.delete_branch_on_merge
merge_commit_message = each.value.merge_commit_message
merge_commit_title = each.value.merge_commit_title

# GitHub ignores the merge commit title/message unless merge commits are
# allowed and reports its own defaults back, so mirror those to avoid a
# perpetual diff.
merge_commit_message = each.value.allow_merge_commit ? each.value.merge_commit_message : "PR_TITLE"
merge_commit_title = each.value.allow_merge_commit ? each.value.merge_commit_title : "MERGE_MESSAGE"

dynamic "template" {
for_each = each.value.template != null ? [each.value.template] : []
Expand Down
Loading