]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.log_--root_--patch-with-stat_--summary_master
t4013: add more tests around -c and --cc
[thirdparty/git.git] / t / t4013 / diff.log_--root_--patch-with-stat_--summary_master
1 $ git log --root --patch-with-stat --summary master
2 commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 Merge: 889b315... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
7 Merge branch 'side'
8
9 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
10 Author: A U Thor <author@example.com>
11 Date: Mon Jun 26 00:03:00 2006 +0000
12
13 Side
14 ---
15 dir/sub | 2 ++
16 file0 | 3 +++
17 file3 | 4 ++++
18 3 files changed, 9 insertions(+), 0 deletions(-)
19 create mode 100644 file3
20
21 diff --git a/dir/sub b/dir/sub
22 index 35d242b..7289e35 100644
23 --- a/dir/sub
24 +++ b/dir/sub
25 @@ -1,2 +1,4 @@
26 A
27 B
28 +1
29 +2
30 diff --git a/file0 b/file0
31 index 01e79c3..f4615da 100644
32 --- a/file0
33 +++ b/file0
34 @@ -1,3 +1,6 @@
35 1
36 2
37 3
38 +A
39 +B
40 +C
41 diff --git a/file3 b/file3
42 new file mode 100644
43 index 0000000..7289e35
44 --- /dev/null
45 +++ b/file3
46 @@ -0,0 +1,4 @@
47 +A
48 +B
49 +1
50 +2
51
52 commit 889b315013ef9f2e2f90aa0b054b267c8a557847
53 Author: A U Thor <author@example.com>
54 Date: Mon Jun 26 00:02:00 2006 +0000
55
56 Third
57 ---
58 dir/sub | 2 ++
59 file1 | 3 +++
60 2 files changed, 5 insertions(+), 0 deletions(-)
61 create mode 100644 file1
62
63 diff --git a/dir/sub b/dir/sub
64 index 8422d40..cead32e 100644
65 --- a/dir/sub
66 +++ b/dir/sub
67 @@ -2,3 +2,5 @@ A
68 B
69 C
70 D
71 +E
72 +F
73 diff --git a/file1 b/file1
74 new file mode 100644
75 index 0000000..b1e6722
76 --- /dev/null
77 +++ b/file1
78 @@ -0,0 +1,3 @@
79 +A
80 +B
81 +C
82
83 commit 7952a93e09bf565b5592766a438b40cd81f4846f
84 Author: A U Thor <author@example.com>
85 Date: Mon Jun 26 00:01:00 2006 +0000
86
87 Second
88 ---
89 dir/sub | 2 ++
90 file0 | 3 +++
91 file2 | 3 ---
92 3 files changed, 5 insertions(+), 3 deletions(-)
93 delete mode 100644 file2
94
95 diff --git a/dir/sub b/dir/sub
96 index 35d242b..8422d40 100644
97 --- a/dir/sub
98 +++ b/dir/sub
99 @@ -1,2 +1,4 @@
100 A
101 B
102 +C
103 +D
104 diff --git a/file0 b/file0
105 index 01e79c3..b414108 100644
106 --- a/file0
107 +++ b/file0
108 @@ -1,3 +1,6 @@
109 1
110 2
111 3
112 +4
113 +5
114 +6
115 diff --git a/file2 b/file2
116 deleted file mode 100644
117 index 01e79c3..0000000
118 --- a/file2
119 +++ /dev/null
120 @@ -1,3 +0,0 @@
121 -1
122 -2
123 -3
124
125 commit 444ac553ac7612cc88969031b02b3767fb8a353a
126 Author: A U Thor <author@example.com>
127 Date: Mon Jun 26 00:00:00 2006 +0000
128
129 Initial
130 ---
131 dir/sub | 2 ++
132 file0 | 3 +++
133 file2 | 3 +++
134 3 files changed, 8 insertions(+), 0 deletions(-)
135 create mode 100644 dir/sub
136 create mode 100644 file0
137 create mode 100644 file2
138
139 diff --git a/dir/sub b/dir/sub
140 new file mode 100644
141 index 0000000..35d242b
142 --- /dev/null
143 +++ b/dir/sub
144 @@ -0,0 +1,2 @@
145 +A
146 +B
147 diff --git a/file0 b/file0
148 new file mode 100644
149 index 0000000..01e79c3
150 --- /dev/null
151 +++ b/file0
152 @@ -0,0 +1,3 @@
153 +1
154 +2
155 +3
156 diff --git a/file2 b/file2
157 new file mode 100644
158 index 0000000..01e79c3
159 --- /dev/null
160 +++ b/file2
161 @@ -0,0 +1,3 @@
162 +1
163 +2
164 +3
165 $