aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2013-05-29 17:27:15 -0700
committerPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>2013-05-29 17:29:32 -0700
commit1bcb69c9d04a2c5e03a74431cf311ac0148fff44 (patch)
treee09ee27c36fe6ba070866ca73416f3599ef50721
parentfc5fd3b02752dfec3e91f6e9b90b375e83ea6888 (diff)
downloadstgit-1bcb69c9d04a2c5e03a74431cf311ac0148fff44.tar.gz
templates: fix attach option to create a proper mbox format
There was a bug where the attach option to stg mail was not spitting out a patch that can be used by git am, because the patch file only contained the diff. This is derived from the same fix from Jesse Brandeburg for the attachinline mbox fix. Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
-rw-r--r--templates/mailattch.tmpl3
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/mailattch.tmpl b/templates/mailattch.tmpl
index 70d2df0..931ddfb 100644
--- a/templates/mailattch.tmpl
+++ b/templates/mailattch.tmpl
@@ -16,5 +16,8 @@ Content-Disposition: inline
Content-Type: text/plain; name=%(patch)s.patch
Content-Disposition: attachment; filename=%(patch)s.patch
+%(fromauth)s%(longdescr)s
+---
+%(diffstat)s
%(diff)s
--MIMEBOUNDARY--