t4013: note improvements brought by the new output code.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jun 29, 2006 at 12:00 UTC
026625e78eaf8ea2ae960525c367b5e8f1629fd4
4 files changed
+68
-6
t/t4013-diff-various.sh
+12
-6
@@ -138,7 +138,10 @@ diff-tree --pretty --summary initial
138
diff-tree --pretty --stat --summary initial
139
diff-tree --pretty --root -p initial
140
diff-tree --pretty --root --stat initial
141
-#diff-tree --pretty --root --summary initial
141
+# improved by Timo's patch
142
+diff-tree --pretty --root --summary initial
143
+# improved by Timo's patch
144
+diff-tree --pretty --root --summary -r initial
145
diff-tree --pretty --root --stat --summary initial
146
diff-tree --pretty --patch-with-stat initial
147
diff-tree --pretty --root --patch-with-stat initial
@@ -150,6 +153,7 @@ diff-tree --pretty=oneline --root initial
153
diff-tree --pretty=oneline -p initial
154
diff-tree --pretty=oneline --root -p initial
155
diff-tree --pretty=oneline --patch-with-stat initial
156
+# improved by Timo's patch
157
diff-tree --pretty=oneline --root --patch-with-stat initial
158
diff-tree --pretty=oneline --patch-with-raw initial
159
diff-tree --pretty=oneline --root --patch-with-raw initial
@@ -172,11 +176,9 @@ diff-tree --cc --stat --summary master
176
# stat summary should show the diffstat and summary with the first parent
177
diff-tree -c --stat --summary side
178
diff-tree --cc --stat --summary side
175
-# this one gives an extra newline after stat, which should be removed
176
-# diff-tree --cc --patch-with-stat master
177
-# this one gives an extra newline after stat, which should be removed
178
-# other than that it shows the correct example -- stat and summary are
179
-# against the first parent, and patch-looking combined diff follows.
179
+# improved by Timo's patch
180
+diff-tree --cc --patch-with-stat master
181
+# improved by Timo's patch
182
diff-tree --cc --patch-with-stat --summary master
183
# this is correct
184
diff-tree --cc --patch-with-stat --summary side
@@ -188,7 +190,9 @@ log --root -p master
190
log --patch-with-stat master
191
log --root --patch-with-stat master
192
log --root --patch-with-stat --summary master
193
+# improved by Timo's patch
194
log --root -c --patch-with-stat --summary master
195
+# improved by Timo's patch
196
log --root --cc --patch-with-stat --summary master
197
log -SF master
198
log -SF -p master
@@ -200,7 +204,9 @@ whatchanged --root -p master
204
whatchanged --patch-with-stat master
205
whatchanged --root --patch-with-stat master
206
whatchanged --root --patch-with-stat --summary master
207
+# improved by Timo's patch
208
whatchanged --root -c --patch-with-stat --summary master
209
+# improved by Timo's patch
210
whatchanged --root --cc --patch-with-stat --summary master
211
whatchanged -SF master
212
whatchanged -SF -p master
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
new
+34
@@ -0,0 +1,34 @@
1
+$ git diff-tree --cc --patch-with-stat master
2
+176b998f5d647cbd77a9d8acf4531e930754d16d
3
+ dir/sub | 2 ++
4
+ file0 | 3 +++
5
+ 2 files changed, 5 insertions(+), 0 deletions(-)
6
+
7
+diff --cc dir/sub
8
+index cead32e,7289e35..992913c
9
+--- a/dir/sub
10
++++ b/dir/sub
11
+@@@ -1,6 -1,4 +1,8 @@@
12
+ A
13
+ B
14
+ +C
15
+ +D
16
+ +E
17
+ +F
18
++ 1
19
++ 2
20
+diff --cc file0
21
+index b414108,f4615da..10a8a9f
22
+--- a/file0
23
++++ b/file0
24
+@@@ -1,6 -1,6 +1,9 @@@
25
+ 1
26
+ 2
27
+ 3
28
+ +4
29
+ +5
30
+ +6
31
++ A
32
++ B
33
++ C
34
+$
t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial
new
+11
@@ -0,0 +1,11 @@
1
+$ git diff-tree --pretty --root --summary -r initial
2
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
3
+Author: A U Thor <author@example.com>
4
+Date: Mon Jun 26 00:00:00 2006 +0000
5
+
6
+ Initial
7
+
8
+ create mode 100644 dir/sub
9
+ create mode 100644 file0
10
+ create mode 100644 file2
11
+$
t/t4013/diff.diff-tree_--pretty_--root_--summary_initial
new
+11
@@ -0,0 +1,11 @@
1
+$ git diff-tree --pretty --root --summary initial
2
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
3
+Author: A U Thor <author@example.com>
4
+Date: Mon Jun 26 00:00:00 2006 +0000
5
+
6
+ Initial
7
+
8
+ create mode 040000 dir
9
+ create mode 100644 file0
10
+ create mode 100644 file2
11
+$