subtree: improve decision on merges kept in split

diff --git a/mailinfo.h b/mailinfo.h
index 93776a7e05a68c49951e9e8e062c164c364d5d45..6830e1e6259bb050cf2af9c2e203c8aa52037da1 100644 (file)
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -1,6 +1,8 @@
 #ifndef MAILINFO_H
 #define MAILINFO_H
 
+#include "strbuf.h"
+
 #define MAX_BOUNDARIES 5
 
 struct mailinfo {
@@ -20,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
@@ -27,6 +31,7 @@ struct mailinfo {
        int patch_lines;
        int filter_stage; /* still reading log or are we copying patch? */
        int header_stage; /* still checking in-body headers? */
+       struct strbuf inbody_header_accum;
        struct strbuf **p_hdr_data;
        struct strbuf **s_hdr_data;