From bf11e7c7aa4ce3337c6697d0b25ee2cdd28ba10c Mon Sep 17 00:00:00 2001 From: Paul Berry Date: Thu, 11 Nov 2010 10:18:04 -0800 Subject: 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. --- tasks/rake/git_workflow.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tasks/rake/git_workflow.rake') 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 -- cgit