From b8fc72ca5d6bc18ab451400c6f44794fa0df06b1 Mon Sep 17 00:00:00 2001
From: Kevin Mahoney <kevin@icecube.dog>
Date: Fri, 9 Feb 2024 12:10:20 +0100
Subject: [PATCH] feat: add [squash_merge|merge]_commit_[messsage|title]

---
 main.tf      |  6 ++++++
 variables.tf | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/main.tf b/main.tf
index 587e1bb..aecaa08 100644
--- a/main.tf
+++ b/main.tf
@@ -109,6 +109,12 @@ resource "github_repository" "repository" {
   archived               = var.archived
   topics                 = local.topics
 
+  merge_commit_message = var.merge_commit_message
+  merge_commit_title   = var.merge_commit_title
+
+  squash_merge_commit_message = var.squash_merge_commit_message
+  squash_merge_commit_title   = var.squash_merge_commit_title
+
   archive_on_destroy   = var.archive_on_destroy
   vulnerability_alerts = local.vulnerability_alerts
 
diff --git a/variables.tf b/variables.tf
index 7599034..804db30 100644
--- a/variables.tf
+++ b/variables.tf
@@ -161,6 +161,30 @@ variable "topics" {
   default     = null
 }
 
+variable "merge_commit_title" {
+  description = "Can be PR_TITLE or MERGE_MESSAGE for a default merge commit title. Applicable only if allow_merge_commit is true."
+  type        = string
+  default     = null
+}
+
+variable "merge_commit_message" {
+  description = "Can be PR_BODY, PR_TITLE, or BLANK for a default merge commit message. Applicable only if allow_merge_commit is true."
+  type        = string
+  default     = null
+}
+
+variable "squash_merge_commit_title" {
+  description = "(Optional) Can be PR_TITLE or COMMIT_OR_PR_TITLE for a default squash merge commit title. Applicable only if allow_squash_merge is true."
+  type        = string
+  default     = null
+}
+
+variable "squash_merge_commit_message" {
+  description = "(Optional) Can be PR_BODY, COMMIT_MESSAGES, or BLANK for a default squash merge commit message. Applicable only if allow_squash_merge is true."
+  type        = string
+  default     = null
+}
+
 variable "extra_topics" {
   description = "(Optional) The list of additional topics of the repository. (Default: [])"
   type        = list(string)