diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 23:53:57 +0300 |
| commit | 6b472d9aafc522a99101de394f46ae284abe8c10 (patch) | |
| tree | 0bdaba0a2225199b98d33b065af2479dadcc3aaf /mailinfo.h | |
| parent | 769af0fd9ea0b4de172b51ae4b9ea41b57c02fd3 (diff) | |
| parent | 3aa4d81f88d2f09173e65eebe35a385b2a064c87 (diff) | |
Merge branch 'rs/mailinfo-format-flowed'
"git mailinfo" used in "git am" learned to make a best-effort
recovery of a patch corrupted by MUA that sends text/plain with
format=flawed option.
* rs/mailinfo-format-flowed:
mailinfo: support format=flowed
Diffstat (limited to 'mailinfo.h')
| -rw-r--r-- | mailinfo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mailinfo.h b/mailinfo.h index 766c03dd1d..6830e1e625 100644 --- a/mailinfo.h +++ b/mailinfo.h @@ -22,6 +22,8 @@ struct mailinfo { struct strbuf *content[MAX_BOUNDARIES]; struct strbuf **content_top; struct strbuf charset; + unsigned int format_flowed:1; + unsigned int delsp:1; char *message_id; enum { TE_DONTCARE, TE_QP, TE_BASE64 |