diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-12 10:28:17 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-12 10:28:17 -0800 |
| commit | c3cdd648658b21efb1797a9caade1e67be6e2b07 (patch) | |
| tree | 6521c665b5339e9d67cd27057ade8bb908ea9513 | |
| parent | 06fb622e293100b214ac0de4f9d09d06dcbdb36e (diff) | |
| parent | 1eef8424c21f6efb8d70d720834e995c20a6b2b4 (diff) | |
| download | facter-c3cdd648658b21efb1797a9caade1e67be6e2b07.tar.gz facter-c3cdd648658b21efb1797a9caade1e67be6e2b07.tar.xz facter-c3cdd648658b21efb1797a9caade1e67be6e2b07.zip | |
Merge branch 'maint/next/add_local_branch_to_mail_patches' into next
| -rw-r--r-- | tasks/rake/mail_patches.rake | 13 |
1 files changed, 12 insertions, 1 deletions
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 = "" |