summaryrefslogtreecommitdiff
path: root/t/t1002-read-tree-m-u-2way.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2011-05-26 18:28:17 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-26 15:56:55 -0700
commit9553d2b26395d9a19bf60875784661090f607f4a (patch)
treecad3fb57c910427092eede0e9fee3f4e64c598b2 /t/t1002-read-tree-m-u-2way.sh
parentclean up calling conventions for pretty.c functions (diff)
downloadtgif-9553d2b26395d9a19bf60875784661090f607f4a.tar.xz
format-patch: preserve subject newlines with -k
In older versions of git, we used rfc822 header folding to indicate that the original subject line had multiple lines in it. But since a1f6baa (format-patch: wrap long header lines, 2011-02-23), we now use header folding whenever there is a long line. This means that "git am" cannot trust header folding as a sign from format-patch that newlines should be preserved. Instead, format-patch needs to signal more explicitly that the newlines are significant. This patch does so by rfc2047-encoding the newlines in the subject line. No changes are needed on the "git am" end; it already decodes the newlines properly. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1002-read-tree-m-u-2way.sh')
0 files changed, 0 insertions, 0 deletions