mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 06:25:13 +01:00
Code Activity

Merge branch 'jc/diff-test-updates' into th/diff

Browse source 
* jc/diff-test-updates:
  t4013 test updates for new output code.
This commit is contained in:
Junio C Hamano 2006-06-28 04:02:46 -07:00
commit f252281102
6 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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