summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorKevin Ballard <kevin@sb.org>2008-07-30 05:49:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-30 06:18:15 (GMT)
commit6b2fbaaffc5ec762eae5d23b58b1dc0a88e2275e (patch)
treec74662decbfde7365c0f7e449458dfa4d5598c0c /log-tree.c
parent8cb070a4cfea48f88ada02a87320c3ca63b934cb (diff)
downloadgit-6b2fbaaffc5ec762eae5d23b58b1dc0a88e2275e.zip
git-6b2fbaaffc5ec762eae5d23b58b1dc0a88e2275e.tar.gz
git-6b2fbaaffc5ec762eae5d23b58b1dc0a88e2275e.tar.bz2
format-patch: Produce better output with --inline or --attach
This patch makes two small changes to improve the output of --inline and --attach. The first is to write a newline preceding the boundary. This is needed because MIME defines the encapsulation boundary as including the preceding CRLF (or in this case, just LF), so we should be writing one. Without this, the last newline in the pre-diff content is consumed instead. The second change is to always write the line termination character (default: newline) even when using --inline or --attach. This is simply to improve the aesthetics of the resulting message. When using --inline an email client should render the resulting message identically to the non-inline version. And when using --attach this adds a blank line preceding the attachment in the email, which is visually attractive. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 5505606..bd8b9e4 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -198,7 +198,7 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
extra_headers = subject_buffer;
snprintf(buffer, sizeof(buffer) - 1,
- "--%s%s\n"
+ "\n--%s%s\n"
"Content-Type: text/x-patch;"
" name=\"%s.diff\"\n"
"Content-Transfer-Encoding: 8bit\n"