]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'jt/mailinfo-fold-in-body-headers'
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:57:12 +0000 (16:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:57:12 +0000 (16:57 -0700)
commit4cff50b3fb50940e57dc10769b2f92d5cec1a05a
tree94ff1cf727557623e3b68fb4b3efbfce4e1e2766
parent21f862b498925194f8f1ebe8203b7a7df756555b
parent6b4b013f1884a3b5e67877d65a9f1da598ab4a6f
Merge branch 'jt/mailinfo-fold-in-body-headers'

When "git format-patch --stdout" output is placed as an in-body
header and it uses the RFC2822 header folding, "git am" failed to
put the header line back into a single logical line.  The
underlying "git mailinfo" was taught to handle this properly.

* jt/mailinfo-fold-in-body-headers:
  mailinfo: handle in-body header continuations
  mailinfo: make is_scissors_line take plain char *
  mailinfo: separate in-body header processing