mirror of
https://github.com/git/git.git
synced 2026-01-12 05:43:12 +09:00
3aa4d81f88
Add best-effort support for patches sent using format=flowed (RFC 3676).
Remove leading spaces ("unstuff"), remove soft line breaks (indicated
by space + newline), but leave the signature separator (dash dash space
newline) alone.
Warn in git am when encountering a format=flowed patch, because any
trailing spaces would most probably be lost, as the sending MUA is
encouraged to remove them when preparing the email.
Provide a test patch formatted by Mozilla Thunderbird 60 using its
default configuration. It reuses the contents of the file mailinfo.c
before and after this patch.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
1.0 KiB
C
45 lines
1.0 KiB
C
#ifndef MAILINFO_H
|
|
#define MAILINFO_H
|
|
|
|
#define MAX_BOUNDARIES 5
|
|
|
|
struct mailinfo {
|
|
FILE *input;
|
|
FILE *output;
|
|
FILE *patchfile;
|
|
|
|
struct strbuf name;
|
|
struct strbuf email;
|
|
int keep_subject;
|
|
int keep_non_patch_brackets_in_subject;
|
|
int add_message_id;
|
|
int use_scissors;
|
|
int use_inbody_headers;
|
|
const char *metainfo_charset;
|
|
|
|
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
|
|
} transfer_encoding;
|
|
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;
|
|
|
|
struct strbuf log_message;
|
|
int input_error;
|
|
};
|
|
|
|
extern void setup_mailinfo(struct mailinfo *);
|
|
extern int mailinfo(struct mailinfo *, const char *msg, const char *patch);
|
|
extern void clear_mailinfo(struct mailinfo *);
|
|
|
|
#endif /* MAILINFO_H */
|