Skip to content

A platform for community discussion. Free, open, simple.

DEV: Keep commit author when merging security fixes (#39010)

David Taylor8803516c416a
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index f123bbf83bb..e2d75326a19 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -250,8 +250,15 @@ namespace :release do
ReleaseUtils.git "merge", "--squash", "privatemirror/#{pr["headRefName"]}"
commit_message = "#{pr["title"]}\n\n#{pr["body"]}".strip
-
- ReleaseUtils.git "commit", "-m", commit_message
+ author =
+ ReleaseUtils.git(
+ "log",
+ "-1",
+ "--format=%an <%ae>",
+ "privatemirror/#{pr["headRefName"]}",
+ ).strip
+
+ ReleaseUtils.git "commit", "-m", commit_message, "--author", author
end
if base == "main" &&