From 254e0a33ee66c65948e15efbe93a810c4077e324 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 24 Nov 2015 13:43:43 +0100 Subject: diff: include commit message when formatting patch When formatting a patch as email we do not include the commit's message in the formatted patch output. Implement this and add a test that verifies behavior. --- tests/resources/diff_format_email/.gitted/index | Bin 256 -> 289 bytes .../objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 | 1 + .../objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba | Bin 0 -> 28 bytes .../objects/d5/ff67764c82f729b13c26a09576570d884d9687 | Bin 0 -> 121 bytes .../diff_format_email/.gitted/refs/heads/master | 2 +- tests/resources/diff_format_email/file3.txt | 1 + 6 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 create mode 100644 tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba create mode 100644 tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 (limited to 'tests/resources') diff --git a/tests/resources/diff_format_email/.gitted/index b/tests/resources/diff_format_email/.gitted/index index f73027e56..d94f87de8 100644 Binary files a/tests/resources/diff_format_email/.gitted/index and b/tests/resources/diff_format_email/.gitted/index differ diff --git a/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 b/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 new file mode 100644 index 000000000..269a5bcf4 --- /dev/null +++ b/tests/resources/diff_format_email/.gitted/objects/62/7e7e12d87e07a83fad5b6bfa25e86ead4a5270 @@ -0,0 +1 @@ +xMN0YGر] !8@%$Nqb5#{Jq+`ޛE!*RR8=5(MT b)⺗AQގE3` W3- cZLO{}O3 Bh.Px쇾gޏ$;f\Ntkzc⊼O{|L3Hx5&hN]G5oxY ܺRL޾7SnG15jl׎׵~1f.f_* wt6 T; \ No newline at end of file diff --git a/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba b/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba new file mode 100644 index 000000000..ba9c5fa57 Binary files /dev/null and b/tests/resources/diff_format_email/.gitted/objects/73/09653445ecf038d3e3dd9ed55edb6cb541a4ba differ diff --git a/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 b/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 new file mode 100644 index 000000000..e838eeb25 Binary files /dev/null and b/tests/resources/diff_format_email/.gitted/objects/d5/ff67764c82f729b13c26a09576570d884d9687 differ diff --git a/tests/resources/diff_format_email/.gitted/refs/heads/master b/tests/resources/diff_format_email/.gitted/refs/heads/master index f0f3f932a..3bc734d47 100644 --- a/tests/resources/diff_format_email/.gitted/refs/heads/master +++ b/tests/resources/diff_format_email/.gitted/refs/heads/master @@ -1 +1 @@ -873806f6f27e631eb0b23e4b56bea2bfac14a373 +627e7e12d87e07a83fad5b6bfa25e86ead4a5270 diff --git a/tests/resources/diff_format_email/file3.txt b/tests/resources/diff_format_email/file3.txt index 9a2d780ac..730965344 100644 --- a/tests/resources/diff_format_email/file3.txt +++ b/tests/resources/diff_format_email/file3.txt @@ -3,3 +3,4 @@ file3! file3 file3 file3 +file3 -- cgit v1.2.1