Code

t4013 diff format tests update
[git.git] / t / t4013 / diff.format-patch_--attach_--stdout_initial..master^
1 $ git format-patch --attach --stdout initial..master^
2 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
6 MIME-Version: 1.0
7 Content-Type: multipart/mixed;
8  boundary="------------g-i-t--v-e-r-s-i-o-n"
10 This is a multi-part message in MIME format.
11 --------------g-i-t--v-e-r-s-i-o-n
12 Content-Type: text/plain; charset=UTF-8; format=fixed
13 Content-Transfer-Encoding: 8bit
16 This is the second commit.
17 ---
18  dir/sub |    2 ++
19  file0   |    3 +++
20  file2   |    3 ---
21  3 files changed, 5 insertions(+), 3 deletions(-)
22 --------------g-i-t--v-e-r-s-i-o-n
23 Content-Type: text/x-patch;
24  name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
25 Content-Transfer-Encoding: 8bit
26 Content-Disposition: inline;
27  filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
29 diff --git a/dir/sub b/dir/sub
30 index 35d242b..8422d40 100644
31 --- a/dir/sub
32 +++ b/dir/sub
33 @@ -1,2 +1,4 @@
34  A
35  B
36 +C
37 +D
38 diff --git a/file0 b/file0
39 index 01e79c3..b414108 100644
40 --- a/file0
41 +++ b/file0
42 @@ -1,3 +1,6 @@
43  1
44  2
45  3
46 +4
47 +5
48 +6
49 diff --git a/file2 b/file2
50 deleted file mode 100644
51 index 01e79c3..0000000
52 --- a/file2
53 +++ /dev/null
54 @@ -1,3 +0,0 @@
55 -1
56 -2
57 -3
59 --------------g-i-t--v-e-r-s-i-o-n--
63 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
64 From: A U Thor <author@example.com>
65 Date: Mon, 26 Jun 2006 00:02:00 +0000
66 Subject: [PATCH] Third
67 MIME-Version: 1.0
68 Content-Type: multipart/mixed;
69  boundary="------------g-i-t--v-e-r-s-i-o-n"
71 This is a multi-part message in MIME format.
72 --------------g-i-t--v-e-r-s-i-o-n
73 Content-Type: text/plain; charset=UTF-8; format=fixed
74 Content-Transfer-Encoding: 8bit
75 ---
76  dir/sub |    2 ++
77  file1   |    3 +++
78  2 files changed, 5 insertions(+), 0 deletions(-)
79 --------------g-i-t--v-e-r-s-i-o-n
80 Content-Type: text/x-patch;
81  name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
82 Content-Transfer-Encoding: 8bit
83 Content-Disposition: inline;
84  filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
86 diff --git a/dir/sub b/dir/sub
87 index 8422d40..cead32e 100644
88 --- a/dir/sub
89 +++ b/dir/sub
90 @@ -2,3 +2,5 @@ A
91  B
92  C
93  D
94 +E
95 +F
96 diff --git a/file1 b/file1
97 new file mode 100644
98 index 0000000..b1e6722
99 --- /dev/null
100 +++ b/file1
101 @@ -0,0 +1,3 @@
102 +A
103 +B
104 +C
106 --------------g-i-t--v-e-r-s-i-o-n--