t4013 test updates for new output code.
These are updates to the test vector that shows the "incompatibility" of the new output code. The changes are actually the good ones, so instead of keeping the older output we adjust the test to the new code. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Jun 27, 2006 at 15:36 UTC
9e76bab14e50c46c624ae35f13c527a7a1b1185d
6 files changed
+4
-10
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
-1
@@ -4,7 +4,6 @@ $ git diff-tree --cc --patch-with-stat --summary master
4
file0 | 3 +++
5
2 files changed, 5 insertions(+), 0 deletions(-)
6
7
-
7
diff --cc dir/sub
8
index cead32e,7289e35..992913c
9
--- a/dir/sub
t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
-1
@@ -1,6 +1,5 @@
1
$ git diff-tree --pretty=oneline --root --patch-with-stat initial
2
444ac553ac7612cc88969031b02b3767fb8a353a Initial
3
----
3
dir/sub | 2 ++
4
file0 | 3 +++
5
file2 | 3 +++
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+1
-2
@@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
5
Date: Mon Jun 26 00:04:00 2006 +0000
6
7
Merge branch 'side'
8
----
8
+
9
dir/sub | 2 ++
10
file0 | 3 +++
11
2 files changed, 5 insertions(+), 0 deletions(-)
12
13
-
13
diff --cc dir/sub
14
index cead32e,7289e35..992913c
15
--- a/dir/sub
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+1
-2
@@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
5
Date: Mon Jun 26 00:04:00 2006 +0000
6
7
Merge branch 'side'
8
----
8
+
9
dir/sub | 2 ++
10
file0 | 3 +++
11
2 files changed, 5 insertions(+), 0 deletions(-)
12
13
-
13
diff --combined dir/sub
14
index cead32e,7289e35..992913c
15
--- a/dir/sub
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+1
-2
@@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
5
Date: Mon Jun 26 00:04:00 2006 +0000
6
7
Merge branch 'side'
8
----
8
+
9
dir/sub | 2 ++
10
file0 | 3 +++
11
2 files changed, 5 insertions(+), 0 deletions(-)
12
13
-
13
diff --cc dir/sub
14
index cead32e,7289e35..992913c
15
--- a/dir/sub
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+1
-2
@@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
5
Date: Mon Jun 26 00:04:00 2006 +0000
6
7
Merge branch 'side'
8
----
8
+
9
dir/sub | 2 ++
10
file0 | 3 +++
11
2 files changed, 5 insertions(+), 0 deletions(-)
12
13
-
13
diff --combined dir/sub
14
index cead32e,7289e35..992913c
15
--- a/dir/sub