summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Rakefile1
-rw-r--r--tasks/rake/mail_patches.rake13
2 files changed, 13 insertions, 1 deletions
diff --git a/Rakefile b/Rakefile
index e472e3a..ba939be 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,6 +3,7 @@
$: << File.expand_path('lib')
$LOAD_PATH << File.join(File.dirname(__FILE__), 'tasks')
+require 'rubygems'
require 'spec'
require 'spec/rake/spectask'
begin
diff --git a/tasks/rake/mail_patches.rake b/tasks/rake/mail_patches.rake
index 6375a22..be8dda1 100644
--- a/tasks/rake/mail_patches.rake
+++ b/tasks/rake/mail_patches.rake
@@ -18,10 +18,21 @@ task :mail_patches do
# Create all of the patches
sh "git format-patch -C -M -s -n --subject-prefix='PATCH/facter' #{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!(/^---\n/, "---\n#{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 = ""