Fix the problem with automerging (#192)

Ensure we're sending in a string instead of a list.

Author: Mariatta

miss_islington/status_change.py

@@ -109,15 +109,13 @@ async def merge_pr(gh, pr, sha, is_automerge=False):
     pr_number = pr["number"]
     async for commit in gh.getiter(f"/repos/python/cpython/pulls/{pr_number}/commits"):
         if commit["sha"] == sha:
-            pr_title = ""
-            pr_commit_msg = ""
-
             if is_automerge:
                 pr_commit_msg = util.normalize_message(pr["body"])
                 pr_title = f"{pr['title']} (GH-{pr_number})"
             else:
-                pr_commit_msg = commit["commit"]["message"].split("\n")
-                pr_title = f"{pr_commit_msg[0]}"
+                commit_msg = commit["commit"]["message"].split("\n")
+                pr_commit_msg = "\n".join(commit_msg[1:])
+                pr_title = f"{commit_msg[0]}"
 
             data = {
                 "commit_title": pr_title,

tests/test_status_change.py

@@ -104,6 +104,10 @@ async def test_ci_passed_with_awaiting_merge_label_pr_is_merged():
         gh.put_data["commit_title"]
         == "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)"
     )
+    assert (
+        gh.put_data["commit_message"]
+        == "\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <[email protected]>"
+    )
 
 
 async def test_ci_passed_with_no_awaiting_merge_label_pr_is_not_merged():
@@ -255,6 +259,10 @@ async def test_awaiting_merge_label_added_and_ci_passed_pr_is_merged():
         gh.put_data["commit_title"]
         == "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)"
     )
+    assert (
+        gh.put_data["commit_message"]
+        == "\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <[email protected]>"
+    )
 
 
 async def test_awaiting_merge_webhook_ci_failure_pr_is_not_merged():