diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-11 10:18:04 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-11 10:18:04 -0800 |
| commit | bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c (patch) | |
| tree | 648cf3a1becf840ab5e885a74ef57f2408aa874e /tasks/rake/git_workflow.rake | |
| parent | 275a224ee245577c4213b3a21bf1e98301740a4e (diff) | |
| download | puppet-bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c.tar.gz puppet-bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c.tar.xz puppet-bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c.zip | |
Maint: Move "Local-branch:" info below "---"
When running "rake mail_patches", moved the "Local-branch:" info lines
below the "---" line in the e-mail, so that if someone applies the
patch using "git am", the "Local-branch" notation won't show up in the
commit message.
Diffstat (limited to 'tasks/rake/git_workflow.rake')
| -rw-r--r-- | tasks/rake/git_workflow.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake index c275bba3f..4c39f98de 100644 --- a/tasks/rake/git_workflow.rake +++ b/tasks/rake/git_workflow.rake @@ -108,7 +108,7 @@ task :mail_patches do files = Dir.glob("00*.patch") files.each do |file| contents = File.read(file) - contents.sub!(/^---$/, "#{additional_info}---") + contents.sub!(/^---\n/, "---\n#{additional_info}") File.open(file, 'w') do |file_handle| file_handle.print contents end |