diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2013-05-29 17:17:58 -0700 |
---|---|---|
committer | Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> | 2013-05-29 17:29:13 -0700 |
commit | fc5fd3b02752dfec3e91f6e9b90b375e83ea6888 (patch) | |
tree | f8f59d254b3ced20dda12d7a9d8e1c17df9d5ccc | |
parent | f7ce854ca49b61bf8b45c9371bb735d40772a860 (diff) | |
download | stgit-fc5fd3b02752dfec3e91f6e9b90b375e83ea6888.tar.gz |
templates: fix attachinline option to generate proper mbox
There was a bug where the attachinline 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 modifies the template to include pretty much the same text in the
mail as is in the attachment.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
-rw-r--r-- | templates/patchandattch.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/patchandattch.tmpl b/templates/patchandattch.tmpl index 8393397..9c4f865 100644 --- a/templates/patchandattch.tmpl +++ b/templates/patchandattch.tmpl @@ -19,5 +19,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-- |