diff options
| author | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-28 10:59:16 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-03-28 10:59:16 -0700 |
| commit | ec3178f7f3e7d4afd167089bc78ec99b88a0b664 (patch) | |
| tree | b461415c279743e10a6bcfe08307f11db13b5769 /tasks/rake/git_workflow.rake | |
| parent | 5693e41291593cd69888fdb0536f616c4f5e3d10 (diff) | |
| parent | 37f9ca09135330ed180fb68d9295a4967a5cc857 (diff) | |
| download | puppet-ec3178f7f3e7d4afd167089bc78ec99b88a0b664.tar.gz puppet-ec3178f7f3e7d4afd167089bc78ec99b88a0b664.tar.xz puppet-ec3178f7f3e7d4afd167089bc78ec99b88a0b664.zip | |
Merge branch 'tickets/2.6.x/6862' into 2.6.next
* tickets/2.6.x/6862:
(#6862) Add a default subject for the mail_patches rake task
Diffstat (limited to 'tasks/rake/git_workflow.rake')
| -rw-r--r-- | tasks/rake/git_workflow.rake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tasks/rake/git_workflow.rake b/tasks/rake/git_workflow.rake index 980d2fbce..f2ae7ee69 100644 --- a/tasks/rake/git_workflow.rake +++ b/tasks/rake/git_workflow.rake @@ -108,12 +108,14 @@ task :mail_patches do # If we've got more than one patch, add --compose if Dir.glob("00*.patch").length > 1 compose = "--compose" + subject = "--subject \"#{type} #{name} against #{parent}\"" else compose = "" + subject = "" end # Now send the mail. - sh "git send-email #{compose} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch" + sh "git send-email #{compose} #{subject} --no-signed-off-by-cc --suppress-from --to puppet-dev@googlegroups.com 00*.patch" # Finally, clean up the patches sh "rm 00*.patch" |