From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 16 May 2021 12:05:23 +0000 (+0900)
Subject: Merge branch 'dd/mailinfo-quoted-cr'
X-Git-Tag: v2.32.0-rc0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=483932a3d8dae23207de8ec8683a5236ef3098d9;p=thirdparty%2Fgit.git

Merge branch 'dd/mailinfo-quoted-cr'

"git mailinfo" (hence "git am") learned the "--quoted-cr" option to
control how lines ending with CRLF wrapped in base64 or qp are
handled.

* dd/mailinfo-quoted-cr:
  am: learn to process quoted lines that ends with CRLF
  mailinfo: allow stripping quoted CR without warning
  mailinfo: allow squelching quoted CRLF warning
  mailinfo: warn if CRLF found in decoded base64/QP email
  mailinfo: stop parsing options manually
  mailinfo: load default metainfo_charset lazily
---

483932a3d8dae23207de8ec8683a5236ef3098d9