summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-05-26 22:28:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 22:56:55 (GMT)
commit9553d2b26395d9a19bf60875784661090f607f4a (patch)
treecad3fb57c910427092eede0e9fee3f4e64c598b2 /commit.h
parent6bf139440c192e157b9c0dab701fa2100fbb1e1e (diff)
downloadgit-9553d2b26395d9a19bf60875784661090f607f4a.zip
git-9553d2b26395d9a19bf60875784661090f607f4a.tar.gz
git-9553d2b26395d9a19bf60875784661090f607f4a.tar.bz2
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 'commit.h')
-rw-r--r--commit.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 2935740..e985dcc 100644
--- a/commit.h
+++ b/commit.h
@@ -74,6 +74,7 @@ struct pretty_print_context
int abbrev;
const char *subject;
const char *after_subject;
+ int preserve_subject;
enum date_mode date_mode;
int need_8bit_cte;
int show_notes;