author | Jeff King <peff@peff.net> | |
Thu, 26 May 2011 22:28:17 +0000 (18:28 -0400) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 26 May 2011 22:56:55 +0000 (15:56 -0700) | ||
commit | 9553d2b26395d9a19bf60875784661090f607f4a | |
tree | cad3fb57c910427092eede0e9fee3f4e64c598b2 | tree | snapshot |
parent | 6bf139440c192e157b9c0dab701fa2100fbb1e1e | commit | diff |
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>
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>
builtin/log.c | diff | blob | history | |
commit.h | diff | blob | history | |
log-tree.c | diff | blob | history | |
pretty.c | diff | blob | history | |
revision.h | diff | blob | history | |
t/t4152-am-subjects.sh | diff | blob | history |