Browse Source

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>
maint
Junio C Hamano 19 years ago
parent
commit
9e76bab14e
  1. 1
      t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
  2. 1
      t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial
  3. 3
      t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
  4. 3
      t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
  5. 3
      t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
  6. 3
      t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master

1
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master

@ -4,7 +4,6 @@ $ git diff-tree --cc --patch-with-stat --summary master @@ -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

1
t/t4013/diff.diff-tree_--pretty=oneline_--root_--patch-with-stat_initial

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

3
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com> @@ -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

3
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com> @@ -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

3
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com> @@ -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

3
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master

@ -5,12 +5,11 @@ Author: A U Thor <author@example.com> @@ -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

Loading…
Cancel
Save