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>
This commit is contained in:
Junio C Hamano 2006-06-27 15:36:19 -07:00
parent 47979d5d5b
commit 9e76bab14e
6 changed files with 4 additions and 10 deletions

View file

@ -4,7 +4,6 @@ $ git diff-tree --cc --patch-with-stat --summary master
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub

View file

@ -1,6 +1,5 @@
$ git diff-tree --pretty=oneline --root --patch-with-stat initial
444ac553ac7612cc88969031b02b3767fb8a353a Initial
---
dir/sub | 2 ++
file0 | 3 +++
file2 | 3 +++

View file

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side'
---
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub

View file

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side'
---
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --combined dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub

View file

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side'
---
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub

View file

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
Merge branch 'side'
---
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --combined dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub