mirror of
https://github.com/git/git
synced 2024-10-31 01:43:41 +00:00
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>
61 lines
1.2 KiB
Text
61 lines
1.2 KiB
Text
$ git format-patch --attach --stdout initial..side
|
|
From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
|
|
From: A U Thor <author@example.com>
|
|
Date: Mon, 26 Jun 2006 00:03:00 +0000
|
|
Subject: [PATCH] Side
|
|
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
|
|
|
|
---
|
|
dir/sub | 2 ++
|
|
file0 | 3 +++
|
|
file3 | 4 ++++
|
|
3 files changed, 9 insertions(+), 0 deletions(-)
|
|
create mode 100644 file3
|
|
|
|
|
|
--------------g-i-t--v-e-r-s-i-o-n
|
|
Content-Type: text/x-patch; name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Disposition: attachment; filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..7289e35 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+1
|
|
+2
|
|
diff --git a/file0 b/file0
|
|
index 01e79c3..f4615da 100644
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -1,3 +1,6 @@
|
|
1
|
|
2
|
|
3
|
|
+A
|
|
+B
|
|
+C
|
|
diff --git a/file3 b/file3
|
|
new file mode 100644
|
|
index 0000000..7289e35
|
|
--- /dev/null
|
|
+++ b/file3
|
|
@@ -0,0 +1,4 @@
|
|
+A
|
|
+B
|
|
+1
|
|
+2
|
|
|
|
--------------g-i-t--v-e-r-s-i-o-n--
|
|
|
|
|
|
$
|