6b2fbaaffc
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>
63 lines
1.3 KiB
Plaintext
63 lines
1.3 KiB
Plaintext
$ git format-patch --inline --stdout initial..master^^
|
|
From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
|
|
From: A U Thor <author@example.com>
|
|
Date: Mon, 26 Jun 2006 00:01:00 +0000
|
|
Subject: [DIFFERENT_PREFIX] Second
|
|
MIME-Version: 1.0
|
|
Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
|
|
|
|
This is a multi-part message in MIME format.
|
|
--------------g-i-t--v-e-r-s-i-o-n
|
|
Content-Type: text/plain; charset=UTF-8; format=fixed
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
This is the second commit.
|
|
---
|
|
dir/sub | 2 ++
|
|
file0 | 3 +++
|
|
file2 | 3 ---
|
|
3 files changed, 5 insertions(+), 3 deletions(-)
|
|
delete mode 100644 file2
|
|
|
|
|
|
--------------g-i-t--v-e-r-s-i-o-n
|
|
Content-Type: text/x-patch; name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Disposition: inline; filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..8422d40 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+C
|
|
+D
|
|
diff --git a/file0 b/file0
|
|
index 01e79c3..b414108 100644
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -1,3 +1,6 @@
|
|
1
|
|
2
|
|
3
|
|
+4
|
|
+5
|
|
+6
|
|
diff --git a/file2 b/file2
|
|
deleted file mode 100644
|
|
index 01e79c3..0000000
|
|
--- a/file2
|
|
+++ /dev/null
|
|
@@ -1,3 +0,0 @@
|
|
-1
|
|
-2
|
|
-3
|
|
|
|
--------------g-i-t--v-e-r-s-i-o-n--
|
|
|
|
|
|
$
|