From 631c5a8e455808dbc919211b5151fd501f6475c9 Mon Sep 17 00:00:00 2001
From: Paul Berry <paul@puppetlabs.com>
Date: Tue, 9 Nov 2010 13:35:59 -0800
Subject: Maint: Add "Local-branch:" info to mails sent by "rake mail_patches"

---
 tasks/rake/git_workflow.rake | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'tasks/rake')

diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake
index b2f96c603..c275bba3f 100644
--- a/tasks/rake/git_workflow.rake
+++ b/tasks/rake/git_workflow.rake
@@ -103,10 +103,21 @@ task :mail_patches do
     # Create all of the patches
     sh "git format-patch -C -M -s -n --subject-prefix='PATCH/puppet' #{parent}..HEAD"
 
+    # Add info to the patches
+    additional_info = "Local-branch: #{branch}\n"
+    files = Dir.glob("00*.patch")
+    files.each do |file|
+        contents = File.read(file)
+        contents.sub!(/^---$/, "#{additional_info}---")
+        File.open(file, 'w') do |file_handle|
+            file_handle.print contents
+        end
+    end
+
     # And then mail them out.
 
     # If we've got more than one patch, add --compose
-    if Dir.glob("00*.patch").length > 1
+    if files.length > 1
         compose = "--compose"
     else
         compose = ""
-- 
cgit