diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:05:15 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-10 16:06:04 -0800 |
| commit | 2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78 (patch) | |
| tree | d7c11657d0bfd44488b235c95819f62f7431b949 /tasks/rake/git_workflow.rake | |
| parent | 7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (diff) | |
| parent | 275a224ee245577c4213b3a21bf1e98301740a4e (diff) | |
| download | puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.gz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.tar.xz puppet-2b8e834fcbc548a221b4cd02ee7200fa4f6c2c78.zip | |
Merge branch 'next'
This marks the end of the agile iteration from 11/3-11/10.
Diffstat (limited to 'tasks/rake/git_workflow.rake')
| -rw-r--r-- | tasks/rake/git_workflow.rake | 13 |
1 files changed, 12 insertions, 1 deletions
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 = "" |