summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-06-26 23:29:11 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-06-26 23:29:11 -0700
commit47979d5d5bb86d058dce77801648734abe1e593b (patch)
tree6f24fbff1c2842c0febf3301ab4cb962c3305953 /t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
parentt4013: add tests for diff/log family output options. (diff)
downloadtgif-47979d5d5bb86d058dce77801648734abe1e593b.tar.xz
t4013: add more tests around -c and --cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master')
-rw-r--r--t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master35
1 files changed, 35 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
new file mode 100644
index 0000000000..e6d0c80567
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
@@ -0,0 +1,35 @@
+$ git diff-tree --cc --patch-with-stat --summary master
+176b998f5d647cbd77a9d8acf4531e930754d16d
+ dir/sub | 2 ++
+ file0 | 3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+
+diff --cc dir/sub
+index cead32e,7289e35..992913c
+--- a/dir/sub
++++ b/dir/sub
+@@@ -1,6 -1,4 +1,8 @@@
+ A
+ B
+ +C
+ +D
+ +E
+ +F
++ 1
++ 2
+diff --cc file0
+index b414108,f4615da..10a8a9f
+--- a/file0
++++ b/file0
+@@@ -1,6 -1,6 +1,9 @@@
+ 1
+ 2
+ 3
+ +4
+ +5
+ +6
++ A
++ B
++ C
+$