Browse Source

t4013: note improvements brought by the new output code.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
026625e78e
  1. 18
      t/t4013-diff-various.sh
  2. 34
      t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
  3. 11
      t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial
  4. 11
      t/t4013/diff.diff-tree_--pretty_--root_--summary_initial

18
t/t4013-diff-various.sh

@ -138,7 +138,10 @@ diff-tree --pretty --summary initial @@ -138,7 +138,10 @@ diff-tree --pretty --summary initial
diff-tree --pretty --stat --summary initial
diff-tree --pretty --root -p initial
diff-tree --pretty --root --stat initial
#diff-tree --pretty --root --summary initial
# improved by Timo's patch
diff-tree --pretty --root --summary initial
# improved by Timo's patch
diff-tree --pretty --root --summary -r initial
diff-tree --pretty --root --stat --summary initial
diff-tree --pretty --patch-with-stat initial
diff-tree --pretty --root --patch-with-stat initial
@ -150,6 +153,7 @@ diff-tree --pretty=oneline --root initial @@ -150,6 +153,7 @@ diff-tree --pretty=oneline --root initial
diff-tree --pretty=oneline -p initial
diff-tree --pretty=oneline --root -p initial
diff-tree --pretty=oneline --patch-with-stat initial
# improved by Timo's patch
diff-tree --pretty=oneline --root --patch-with-stat initial
diff-tree --pretty=oneline --patch-with-raw initial
diff-tree --pretty=oneline --root --patch-with-raw initial
@ -172,11 +176,9 @@ diff-tree --cc --stat --summary master @@ -172,11 +176,9 @@ diff-tree --cc --stat --summary master
# stat summary should show the diffstat and summary with the first parent
diff-tree -c --stat --summary side
diff-tree --cc --stat --summary side
# this one gives an extra newline after stat, which should be removed
# diff-tree --cc --patch-with-stat master
# this one gives an extra newline after stat, which should be removed
# other than that it shows the correct example -- stat and summary are
# against the first parent, and patch-looking combined diff follows.
# improved by Timo's patch
diff-tree --cc --patch-with-stat master
# improved by Timo's patch
diff-tree --cc --patch-with-stat --summary master
# this is correct
diff-tree --cc --patch-with-stat --summary side
@ -188,7 +190,9 @@ log --root -p master @@ -188,7 +190,9 @@ log --root -p master
log --patch-with-stat master
log --root --patch-with-stat master
log --root --patch-with-stat --summary master
# improved by Timo's patch
log --root -c --patch-with-stat --summary master
# improved by Timo's patch
log --root --cc --patch-with-stat --summary master
log -SF master
log -SF -p master
@ -200,7 +204,9 @@ whatchanged --root -p master @@ -200,7 +204,9 @@ whatchanged --root -p master
whatchanged --patch-with-stat master
whatchanged --root --patch-with-stat master
whatchanged --root --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root -c --patch-with-stat --summary master
# improved by Timo's patch
whatchanged --root --cc --patch-with-stat --summary master
whatchanged -SF master
whatchanged -SF -p master

34
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master

@ -0,0 +1,34 @@ @@ -0,0 +1,34 @@
$ git diff-tree --cc --patch-with-stat 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
$

11
t/t4013/diff.diff-tree_--pretty_--root_--summary_-r_initial

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
$ git diff-tree --pretty --root --summary -r initial
commit 444ac553ac7612cc88969031b02b3767fb8a353a
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:00:00 2006 +0000

Initial

create mode 100644 dir/sub
create mode 100644 file0
create mode 100644 file2
$

11
t/t4013/diff.diff-tree_--pretty_--root_--summary_initial

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
$ git diff-tree --pretty --root --summary initial
commit 444ac553ac7612cc88969031b02b3767fb8a353a
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:00:00 2006 +0000

Initial

create mode 040000 dir
create mode 100644 file0
create mode 100644 file2
$
Loading…
Cancel
Save