diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 13:53:57 -0700 |
| commit | 6b472d9aafc522a99101de394f46ae284abe8c10 (patch) | |
| tree | 0bdaba0a2225199b98d33b065af2479dadcc3aaf /builtin/am.c | |
| parent | Merge branch 'jk/cocci' (diff) | |
| parent | mailinfo: support format=flowed (diff) | |
| download | tgif-6b472d9aafc522a99101de394f46ae284abe8c10.tar.xz | |
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 'builtin/am.c')
| -rw-r--r-- | builtin/am.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/builtin/am.c b/builtin/am.c index 162a048bf7..5e643e2a3e 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1244,6 +1244,10 @@ static int parse_mail(struct am_state *state, const char *mail) fclose(mi.input); fclose(mi.output); + if (mi.format_flowed) + warning(_("Patch sent with format=flowed; " + "space at the end of lines might be lost.")); + /* Extract message and author information */ fp = xfopen(am_path(state, "info"), "r"); while (!strbuf_getline_lf(&sb, fp)) { |