summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-05-26 18:28:17 -0400
committerJunio C Hamano <gitster@pobox.com>2011-05-26 15:56:55 -0700
commit9553d2b26395d9a19bf60875784661090f607f4a (patch)
treecad3fb57c910427092eede0e9fee3f4e64c598b2 /pretty.c
parent6bf139440c192e157b9c0dab701fa2100fbb1e1e (diff)
downloadgit-9553d2b26395d9a19bf60875784661090f607f4a.tar.gz
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 'pretty.c')
-rw-r--r--pretty.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 1bb7e075ea..193bafd835 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1131,7 +1131,8 @@ void pp_title_line(const struct pretty_print_context *pp,
struct strbuf title;
strbuf_init(&title, 80);
- *msg_p = format_subject(&title, *msg_p, " ");
+ *msg_p = format_subject(&title, *msg_p,
+ pp->preserve_subject ? "\n" : " ");
strbuf_grow(sb, title.len + 1024);
if (pp->subject) {