Merge branch 'jc/diff-test' into th/diff
* jc/diff-test: t4013: add more tests around -c and --cc t4013: add tests for diff/log family output options.
This commit is contained in:
Junio C Hamano
commit
a959e0dc16
224
t/t4013-diff-various.sh
Executable file
224
t/t4013-diff-various.sh
Executable file
@ -0,0 +1,224 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Junio C Hamano
|
||||
#
|
||||
|
||||
test_description='Various diff formatting options'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
mkdir dir &&
|
||||
for i in 1 2 3; do echo $i; done >file0 &&
|
||||
for i in A B; do echo $i; done >dir/sub &&
|
||||
cat file0 >file2 &&
|
||||
git add file0 file2 dir/sub &&
|
||||
git commit -m Initial &&
|
||||
|
||||
git branch initial &&
|
||||
git branch side &&
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:01:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:01:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
for i in 4 5 6; do echo $i; done >>file0 &&
|
||||
for i in C D; do echo $i; done >>dir/sub &&
|
||||
rm -f file2 &&
|
||||
git update-index --remove file0 file2 dir/sub &&
|
||||
git commit -m Second &&
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
for i in A B C; do echo $i; done >file1 &&
|
||||
git add file1 &&
|
||||
for i in E F; do echo $i; done >>dir/sub &&
|
||||
git update-index dir/sub &&
|
||||
git commit -m Third &&
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:03:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:03:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
git checkout side &&
|
||||
for i in A B C; do echo $i; done >>file0 &&
|
||||
for i in 1 2; do echo $i; done >>dir/sub &&
|
||||
cat dir/sub >file3 &&
|
||||
git add file3 &&
|
||||
git update-index file0 dir/sub &&
|
||||
git commit -m Side &&
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:04:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:04:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
git checkout master &&
|
||||
git pull -s ours . side &&
|
||||
|
||||
GIT_AUTHOR_DATE="2006-06-26 00:05:00 +0000" &&
|
||||
GIT_COMMITTER_DATE="2006-06-26 00:05:00 +0000" &&
|
||||
export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
|
||||
|
||||
for i in A B C; do echo $i; done >>file0 &&
|
||||
for i in 1 2; do echo $i; done >>dir/sub &&
|
||||
git update-index file0 dir/sub &&
|
||||
|
||||
EDITOR=: VISUAL=: git commit --amend &&
|
||||
git show-branch
|
||||
'
|
||||
|
||||
: <<\EOF
|
||||
! [initial] Initial
|
||||
* [master] Merge branch 'side'
|
||||
! [side] Side
|
||||
---
|
||||
- [master] Merge branch 'side'
|
||||
*+ [side] Side
|
||||
* [master^] Second
|
||||
+*+ [initial] Initial
|
||||
EOF
|
||||
|
||||
while read cmd
|
||||
do
|
||||
case "$cmd" in
|
||||
'' | '#'*) continue ;;
|
||||
esac
|
||||
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
|
||||
cnt=`expr $test_count + 1`
|
||||
pfx=`printf "%04d" $cnt`
|
||||
expect="../t4013/diff.$test"
|
||||
actual="$pfx-diff.$test"
|
||||
|
||||
test_expect_success "git $cmd" '
|
||||
{
|
||||
echo "\$ git $cmd"
|
||||
git $cmd
|
||||
echo "\$"
|
||||
} >"$actual" &&
|
||||
if test -f "$expect"
|
||||
then
|
||||
diff -u "$expect" "$actual" &&
|
||||
rm -f "$actual"
|
||||
else
|
||||
# this is to help developing new tests.
|
||||
cp "$actual" "$expect"
|
||||
false
|
||||
fi
|
||||
'
|
||||
done <<\EOF
|
||||
diff-tree initial
|
||||
diff-tree -r initial
|
||||
diff-tree -r --abbrev initial
|
||||
diff-tree -r --abbrev=4 initial
|
||||
diff-tree --root initial
|
||||
diff-tree --root --abbrev initial
|
||||
diff-tree --root -r initial
|
||||
diff-tree --root -r --abbrev initial
|
||||
diff-tree --root -r --abbrev=4 initial
|
||||
diff-tree -p initial
|
||||
diff-tree --root -p initial
|
||||
diff-tree --patch-with-stat initial
|
||||
diff-tree --root --patch-with-stat initial
|
||||
diff-tree --patch-with-raw initial
|
||||
diff-tree --root --patch-with-raw initial
|
||||
|
||||
diff-tree --pretty initial
|
||||
diff-tree --pretty --root initial
|
||||
diff-tree --pretty -p initial
|
||||
diff-tree --pretty --stat initial
|
||||
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
|
||||
diff-tree --pretty --root --stat --summary initial
|
||||
diff-tree --pretty --patch-with-stat initial
|
||||
diff-tree --pretty --root --patch-with-stat initial
|
||||
diff-tree --pretty --patch-with-raw initial
|
||||
diff-tree --pretty --root --patch-with-raw initial
|
||||
|
||||
diff-tree --pretty=oneline initial
|
||||
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
|
||||
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
|
||||
|
||||
diff-tree --pretty side
|
||||
diff-tree --pretty -p side
|
||||
diff-tree --pretty --patch-with-stat side
|
||||
|
||||
diff-tree master
|
||||
diff-tree -p master
|
||||
diff-tree -p -m master
|
||||
diff-tree -c master
|
||||
diff-tree -c --abbrev master
|
||||
diff-tree --cc master
|
||||
# stat only should show the diffstat with the first parent
|
||||
diff-tree -c --stat master
|
||||
diff-tree --cc --stat master
|
||||
diff-tree -c --stat --summary master
|
||||
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.
|
||||
diff-tree --cc --patch-with-stat --summary master
|
||||
# this is correct
|
||||
diff-tree --cc --patch-with-stat --summary side
|
||||
|
||||
log master
|
||||
log -p master
|
||||
log --root master
|
||||
log --root -p master
|
||||
log --patch-with-stat master
|
||||
log --root --patch-with-stat master
|
||||
log --root --patch-with-stat --summary master
|
||||
log --root -c --patch-with-stat --summary master
|
||||
log --root --cc --patch-with-stat --summary master
|
||||
log -SF master
|
||||
log -SF -p master
|
||||
|
||||
whatchanged master
|
||||
whatchanged -p master
|
||||
whatchanged --root master
|
||||
whatchanged --root -p master
|
||||
whatchanged --patch-with-stat master
|
||||
whatchanged --root --patch-with-stat master
|
||||
whatchanged --root --patch-with-stat --summary master
|
||||
whatchanged --root -c --patch-with-stat --summary master
|
||||
whatchanged --root --cc --patch-with-stat --summary master
|
||||
whatchanged -SF master
|
||||
whatchanged -SF -p master
|
||||
|
||||
log --patch-with-stat master -- dir/
|
||||
whatchanged --patch-with-stat master -- dir/
|
||||
log --patch-with-stat --summary master -- dir/
|
||||
whatchanged --patch-with-stat --summary master -- dir/
|
||||
|
||||
show initial
|
||||
show --root initial
|
||||
show side
|
||||
show master
|
||||
show --stat side
|
||||
show --stat --summary side
|
||||
show --patch-with-stat side
|
||||
show --patch-with-raw side
|
||||
show --patch-with-stat --summary side
|
||||
|
||||
EOF
|
||||
|
||||
test_done
|
||||
@ -0,0 +1,35 @@
|
||||
$ git diff-tree --cc --patch-with-stat --summary 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
|
||||
$
|
||||
39
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side
Normal file
39
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_side
Normal file
@ -0,0 +1,39 @@
|
||||
$ git diff-tree --cc --patch-with-stat --summary side
|
||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
Normal file
6
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --cc --stat --summary master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
$
|
||||
8
t/t4013/diff.diff-tree_--cc_--stat_--summary_side
Normal file
8
t/t4013/diff.diff-tree_--cc_--stat_--summary_side
Normal file
@ -0,0 +1,8 @@
|
||||
$ git diff-tree --cc --stat --summary side
|
||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--cc_--stat_master
Normal file
6
t/t4013/diff.diff-tree_--cc_--stat_master
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --cc --stat master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
$
|
||||
30
t/t4013/diff.diff-tree_--cc_master
Normal file
30
t/t4013/diff.diff-tree_--cc_master
Normal file
@ -0,0 +1,30 @@
|
||||
$ git diff-tree --cc master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
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
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--patch-with-raw_initial
Normal file
2
t/t4013/diff.diff-tree_--patch-with-raw_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --patch-with-raw initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--patch-with-stat_initial
Normal file
2
t/t4013/diff.diff-tree_--patch-with-stat_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --patch-with-stat initial
|
||||
$
|
||||
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty=oneline --patch-with-raw initial
|
||||
$
|
||||
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty=oneline --patch-with-stat initial
|
||||
$
|
||||
@ -0,0 +1,33 @@
|
||||
$ git diff-tree --pretty=oneline --root --patch-with-raw initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
||||
:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
@ -0,0 +1,35 @@
|
||||
$ git diff-tree --pretty=oneline --root --patch-with-stat initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
29
t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial
Normal file
29
t/t4013/diff.diff-tree_--pretty=oneline_--root_-p_initial
Normal file
@ -0,0 +1,29 @@
|
||||
$ git diff-tree --pretty=oneline --root -p initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--pretty=oneline_--root_initial
Normal file
6
t/t4013/diff.diff-tree_--pretty=oneline_--root_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --pretty=oneline --root initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a Initial
|
||||
:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty=oneline_-p_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty=oneline_-p_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty=oneline -p initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty=oneline_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty=oneline_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty=oneline initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_--patch-with-raw_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty --patch-with-raw initial
|
||||
$
|
||||
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty --patch-with-stat initial
|
||||
$
|
||||
43
t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
Normal file
43
t/t4013/diff.diff-tree_--pretty_--patch-with-stat_side
Normal file
@ -0,0 +1,43 @@
|
||||
$ git diff-tree --pretty --patch-with-stat side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
@ -0,0 +1,38 @@
|
||||
$ git diff-tree --pretty --root --patch-with-raw initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
@ -0,0 +1,39 @@
|
||||
$ git diff-tree --pretty --root --patch-with-stat initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
@ -0,0 +1,15 @@
|
||||
$ git diff-tree --pretty --root --stat --summary initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
$
|
||||
12
t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
Normal file
12
t/t4013/diff.diff-tree_--pretty_--root_--stat_initial
Normal file
@ -0,0 +1,12 @@
|
||||
$ git diff-tree --pretty --root --stat initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
$
|
||||
34
t/t4013/diff.diff-tree_--pretty_--root_-p_initial
Normal file
34
t/t4013/diff.diff-tree_--pretty_--root_-p_initial
Normal file
@ -0,0 +1,34 @@
|
||||
$ git diff-tree --pretty --root -p initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
11
t/t4013/diff.diff-tree_--pretty_--root_initial
Normal file
11
t/t4013/diff.diff-tree_--pretty_--root_initial
Normal file
@ -0,0 +1,11 @@
|
||||
$ git diff-tree --pretty --root initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_--stat_--summary_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty --stat --summary initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_--stat_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_--stat_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty --stat initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_--summary_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_--summary_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty --summary initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_-p_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_-p_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty -p initial
|
||||
$
|
||||
38
t/t4013/diff.diff-tree_--pretty_-p_side
Normal file
38
t/t4013/diff.diff-tree_--pretty_-p_side
Normal file
@ -0,0 +1,38 @@
|
||||
$ git diff-tree --pretty -p side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_--pretty_initial
Normal file
2
t/t4013/diff.diff-tree_--pretty_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree --pretty initial
|
||||
$
|
||||
11
t/t4013/diff.diff-tree_--pretty_side
Normal file
11
t/t4013/diff.diff-tree_--pretty_side
Normal file
@ -0,0 +1,11 @@
|
||||
$ git diff-tree --pretty side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
:040000 040000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 f977ed46ae6873c1c30ab878e15a4accedc3618b M dir
|
||||
:100644 100644 01e79c32a8c99c557f0757da7cb6d65b3414466d f4615da674c09df322d6ba8d6b21ecfb1b1ba510 M file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 7289e35bff32727c08dda207511bec138fdb9ea5 A file3
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--root_--abbrev_initial
Normal file
6
t/t4013/diff.diff-tree_--root_--abbrev_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --root --abbrev initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 040000 0000000... da7a33f... A dir
|
||||
:000000 100644 0000000... 01e79c3... A file0
|
||||
:000000 100644 0000000... 01e79c3... A file2
|
||||
$
|
||||
33
t/t4013/diff.diff-tree_--root_--patch-with-raw_initial
Normal file
33
t/t4013/diff.diff-tree_--root_--patch-with-raw_initial
Normal file
@ -0,0 +1,33 @@
|
||||
$ git diff-tree --root --patch-with-raw initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
34
t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
Normal file
34
t/t4013/diff.diff-tree_--root_--patch-with-stat_initial
Normal file
@ -0,0 +1,34 @@
|
||||
$ git diff-tree --root --patch-with-stat initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
29
t/t4013/diff.diff-tree_--root_-p_initial
Normal file
29
t/t4013/diff.diff-tree_--root_-p_initial
Normal file
@ -0,0 +1,29 @@
|
||||
$ git diff-tree --root -p initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial
Normal file
6
t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --root -r --abbrev=4 initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 100644 0000... 35d2... A dir/sub
|
||||
:000000 100644 0000... 01e7... A file0
|
||||
:000000 100644 0000... 01e7... A file2
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--root_-r_--abbrev_initial
Normal file
6
t/t4013/diff.diff-tree_--root_-r_--abbrev_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --root -r --abbrev initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 100644 0000000... 35d242b... A dir/sub
|
||||
:000000 100644 0000000... 01e79c3... A file0
|
||||
:000000 100644 0000000... 01e79c3... A file2
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--root_-r_initial
Normal file
6
t/t4013/diff.diff-tree_--root_-r_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --root -r initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 100644 0000000000000000000000000000000000000000 35d242ba79ae89ac695e26b3d4c27a8e6f028f9e A dir/sub
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_--root_initial
Normal file
6
t/t4013/diff.diff-tree_--root_initial
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree --root initial
|
||||
444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
:000000 040000 0000000000000000000000000000000000000000 da7a33fa77d8066d6698643940ce5860fe2d7fb3 A dir
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file0
|
||||
:000000 100644 0000000000000000000000000000000000000000 01e79c32a8c99c557f0757da7cb6d65b3414466d A file2
|
||||
$
|
||||
5
t/t4013/diff.diff-tree_-c_--abbrev_master
Normal file
5
t/t4013/diff.diff-tree_-c_--abbrev_master
Normal file
@ -0,0 +1,5 @@
|
||||
$ git diff-tree -c --abbrev master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub
|
||||
::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_-c_--stat_--summary_master
Normal file
6
t/t4013/diff.diff-tree_-c_--stat_--summary_master
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree -c --stat --summary master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
$
|
||||
8
t/t4013/diff.diff-tree_-c_--stat_--summary_side
Normal file
8
t/t4013/diff.diff-tree_-c_--stat_--summary_side
Normal file
@ -0,0 +1,8 @@
|
||||
$ git diff-tree -c --stat --summary side
|
||||
c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
$
|
||||
6
t/t4013/diff.diff-tree_-c_--stat_master
Normal file
6
t/t4013/diff.diff-tree_-c_--stat_master
Normal file
@ -0,0 +1,6 @@
|
||||
$ git diff-tree -c --stat master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
$
|
||||
5
t/t4013/diff.diff-tree_-c_master
Normal file
5
t/t4013/diff.diff-tree_-c_master
Normal file
@ -0,0 +1,5 @@
|
||||
$ git diff-tree -c master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
|
||||
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
|
||||
$
|
||||
80
t/t4013/diff.diff-tree_-p_-m_master
Normal file
80
t/t4013/diff.diff-tree_-p_-m_master
Normal file
@ -0,0 +1,80 @@
|
||||
$ git diff-tree -p -m master
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index cead32e..992913c 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -4,3 +4,5 @@ C
|
||||
D
|
||||
E
|
||||
F
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index b414108..10a8a9f 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -4,3 +4,6 @@
|
||||
4
|
||||
5
|
||||
6
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 7289e35..992913c 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,4 +1,8 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
+E
|
||||
+F
|
||||
1
|
||||
2
|
||||
diff --git a/file0 b/file0
|
||||
index f4615da..10a8a9f 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,6 +1,9 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
A
|
||||
B
|
||||
C
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
diff --git a/file3 b/file3
|
||||
deleted file mode 100644
|
||||
index 7289e35..0000000
|
||||
--- a/file3
|
||||
+++ /dev/null
|
||||
@@ -1,4 +0,0 @@
|
||||
-A
|
||||
-B
|
||||
-1
|
||||
-2
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_-p_initial
Normal file
2
t/t4013/diff.diff-tree_-p_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree -p initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_-p_master
Normal file
2
t/t4013/diff.diff-tree_-p_master
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree -p master
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_-r_--abbrev=4_initial
Normal file
2
t/t4013/diff.diff-tree_-r_--abbrev=4_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree -r --abbrev=4 initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_-r_--abbrev_initial
Normal file
2
t/t4013/diff.diff-tree_-r_--abbrev_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree -r --abbrev initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_-r_initial
Normal file
2
t/t4013/diff.diff-tree_-r_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree -r initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_initial
Normal file
2
t/t4013/diff.diff-tree_initial
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree initial
|
||||
$
|
||||
2
t/t4013/diff.diff-tree_master
Normal file
2
t/t4013/diff.diff-tree_master
Normal file
@ -0,0 +1,2 @@
|
||||
$ git diff-tree master
|
||||
$
|
||||
72
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
Normal file
72
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
Normal file
@ -0,0 +1,72 @@
|
||||
$ git log --patch-with-stat --summary master -- dir/
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
127
t/t4013/diff.log_--patch-with-stat_master
Normal file
127
t/t4013/diff.log_--patch-with-stat_master
Normal file
@ -0,0 +1,127 @@
|
||||
$ git log --patch-with-stat master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
72
t/t4013/diff.log_--patch-with-stat_master_--_dir_
Normal file
72
t/t4013/diff.log_--patch-with-stat_master_--_dir_
Normal file
@ -0,0 +1,72 @@
|
||||
$ git log --patch-with-stat master -- dir/
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
198
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
Normal file
198
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
Normal file
@ -0,0 +1,198 @@
|
||||
$ git log --root --cc --patch-with-stat --summary master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
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
|
||||
+++ 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
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
165
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
Normal file
165
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
Normal file
@ -0,0 +1,165 @@
|
||||
$ git log --root --patch-with-stat --summary master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
159
t/t4013/diff.log_--root_--patch-with-stat_master
Normal file
159
t/t4013/diff.log_--root_--patch-with-stat_master
Normal file
@ -0,0 +1,159 @@
|
||||
$ git log --root --patch-with-stat master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
198
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
Normal file
198
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
Normal file
@ -0,0 +1,198 @@
|
||||
$ git log --root -c --patch-with-stat --summary master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
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
|
||||
+++ b/dir/sub
|
||||
@@@ -1,6 -1,4 +1,8 @@@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
+E
|
||||
+F
|
||||
+ 1
|
||||
+ 2
|
||||
diff --combined file0
|
||||
index b414108,f4615da..10a8a9f
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@@ -1,6 -1,6 +1,9 @@@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
+ A
|
||||
+ B
|
||||
+ C
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
140
t/t4013/diff.log_--root_-p_master
Normal file
140
t/t4013/diff.log_--root_-p_master
Normal file
@ -0,0 +1,140 @@
|
||||
$ git log --root -p master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
32
t/t4013/diff.log_--root_master
Normal file
32
t/t4013/diff.log_--root_master
Normal file
@ -0,0 +1,32 @@
|
||||
$ git log --root master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
18
t/t4013/diff.log_-SF_-p_master
Normal file
18
t/t4013/diff.log_-SF_-p_master
Normal file
@ -0,0 +1,18 @@
|
||||
$ git log -SF -p master
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
$
|
||||
8
t/t4013/diff.log_-SF_master
Normal file
8
t/t4013/diff.log_-SF_master
Normal file
@ -0,0 +1,8 @@
|
||||
$ git log -SF master
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
$
|
||||
113
t/t4013/diff.log_-p_master
Normal file
113
t/t4013/diff.log_-p_master
Normal file
@ -0,0 +1,113 @@
|
||||
$ git log -p master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
32
t/t4013/diff.log_master
Normal file
32
t/t4013/diff.log_master
Normal file
@ -0,0 +1,32 @@
|
||||
$ git log master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
42
t/t4013/diff.show_--patch-with-raw_side
Normal file
42
t/t4013/diff.show_--patch-with-raw_side
Normal file
@ -0,0 +1,42 @@
|
||||
$ git show --patch-with-raw side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
:100644 100644 35d242b... 7289e35... M dir/sub
|
||||
:100644 100644 01e79c3... f4615da... M file0
|
||||
:000000 100644 0000000... 7289e35... A file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
44
t/t4013/diff.show_--patch-with-stat_--summary_side
Normal file
44
t/t4013/diff.show_--patch-with-stat_--summary_side
Normal file
@ -0,0 +1,44 @@
|
||||
$ git show --patch-with-stat --summary side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
43
t/t4013/diff.show_--patch-with-stat_side
Normal file
43
t/t4013/diff.show_--patch-with-stat_side
Normal file
@ -0,0 +1,43 @@
|
||||
$ git show --patch-with-stat side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
34
t/t4013/diff.show_--root_initial
Normal file
34
t/t4013/diff.show_--root_initial
Normal file
@ -0,0 +1,34 @@
|
||||
$ git show --root initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
13
t/t4013/diff.show_--stat_--summary_side
Normal file
13
t/t4013/diff.show_--stat_--summary_side
Normal file
@ -0,0 +1,13 @@
|
||||
$ git show --stat --summary side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
$
|
||||
12
t/t4013/diff.show_--stat_side
Normal file
12
t/t4013/diff.show_--stat_side
Normal file
@ -0,0 +1,12 @@
|
||||
$ git show --stat side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
$
|
||||
7
t/t4013/diff.show_initial
Normal file
7
t/t4013/diff.show_initial
Normal file
@ -0,0 +1,7 @@
|
||||
$ git show initial
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
$
|
||||
36
t/t4013/diff.show_master
Normal file
36
t/t4013/diff.show_master
Normal file
@ -0,0 +1,36 @@
|
||||
$ git show master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:04:00 2006 +0000
|
||||
|
||||
Merge branch 'side'
|
||||
|
||||
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
|
||||
$
|
||||
38
t/t4013/diff.show_side
Normal file
38
t/t4013/diff.show_side
Normal file
@ -0,0 +1,38 @@
|
||||
$ git show side
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
$
|
||||
@ -0,0 +1,59 @@
|
||||
$ git whatchanged --patch-with-stat --summary master -- dir/
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
$
|
||||
114
t/t4013/diff.whatchanged_--patch-with-stat_master
Normal file
114
t/t4013/diff.whatchanged_--patch-with-stat_master
Normal file
@ -0,0 +1,114 @@
|
||||
$ git whatchanged --patch-with-stat master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
$
|
||||
59
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
Normal file
59
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
Normal file
@ -0,0 +1,59 @@
|
||||
$ git whatchanged --patch-with-stat master -- dir/
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
$
|
||||
@ -0,0 +1,198 @@
|
||||
$ git whatchanged --root --cc --patch-with-stat --summary master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
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
|
||||
+++ 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
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
@ -0,0 +1,158 @@
|
||||
$ git whatchanged --root --patch-with-stat --summary master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
152
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
Normal file
152
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
Normal file
@ -0,0 +1,152 @@
|
||||
$ git whatchanged --root --patch-with-stat master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
@ -0,0 +1,198 @@
|
||||
$ git whatchanged --root -c --patch-with-stat --summary master
|
||||
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
|
||||
Merge: 889b315... c7a2ab9...
|
||||
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
|
||||
+++ b/dir/sub
|
||||
@@@ -1,6 -1,4 +1,8 @@@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
+E
|
||||
+F
|
||||
+ 1
|
||||
+ 2
|
||||
diff --combined file0
|
||||
index b414108,f4615da..10a8a9f
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@@ -1,6 -1,6 +1,9 @@@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
+ A
|
||||
+ B
|
||||
+ C
|
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file3 | 4 ++++
|
||||
3 files changed, 9 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file3
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file1 | 3 +++
|
||||
2 files changed, 5 insertions(+), 0 deletions(-)
|
||||
create mode 100644 file1
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 ---
|
||||
3 files changed, 5 insertions(+), 3 deletions(-)
|
||||
delete mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
---
|
||||
dir/sub | 2 ++
|
||||
file0 | 3 +++
|
||||
file2 | 3 +++
|
||||
3 files changed, 8 insertions(+), 0 deletions(-)
|
||||
create mode 100644 dir/sub
|
||||
create mode 100644 file0
|
||||
create mode 100644 file2
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
133
t/t4013/diff.whatchanged_--root_-p_master
Normal file
133
t/t4013/diff.whatchanged_--root_-p_master
Normal file
@ -0,0 +1,133 @@
|
||||
$ git whatchanged --root -p master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
new file mode 100644
|
||||
index 0000000..35d242b
|
||||
--- /dev/null
|
||||
+++ b/dir/sub
|
||||
@@ -0,0 +1,2 @@
|
||||
+A
|
||||
+B
|
||||
diff --git a/file0 b/file0
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file0
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
diff --git a/file2 b/file2
|
||||
new file mode 100644
|
||||
index 0000000..01e79c3
|
||||
--- /dev/null
|
||||
+++ b/file2
|
||||
@@ -0,0 +1,3 @@
|
||||
+1
|
||||
+2
|
||||
+3
|
||||
$
|
||||
40
t/t4013/diff.whatchanged_--root_master
Normal file
40
t/t4013/diff.whatchanged_--root_master
Normal file
@ -0,0 +1,40 @@
|
||||
$ git whatchanged --root master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
:100644 100644 35d242b... 7289e35... M dir/sub
|
||||
:100644 100644 01e79c3... f4615da... M file0
|
||||
:000000 100644 0000000... 7289e35... A file3
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
:100644 100644 8422d40... cead32e... M dir/sub
|
||||
:000000 100644 0000000... b1e6722... A file1
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
:100644 100644 35d242b... 8422d40... M dir/sub
|
||||
:100644 100644 01e79c3... b414108... M file0
|
||||
:100644 000000 01e79c3... 0000000... D file2
|
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:00:00 2006 +0000
|
||||
|
||||
Initial
|
||||
|
||||
:000000 100644 0000000... 35d242b... A dir/sub
|
||||
:000000 100644 0000000... 01e79c3... A file0
|
||||
:000000 100644 0000000... 01e79c3... A file2
|
||||
$
|
||||
18
t/t4013/diff.whatchanged_-SF_-p_master
Normal file
18
t/t4013/diff.whatchanged_-SF_-p_master
Normal file
@ -0,0 +1,18 @@
|
||||
$ git whatchanged -SF -p master
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
$
|
||||
9
t/t4013/diff.whatchanged_-SF_master
Normal file
9
t/t4013/diff.whatchanged_-SF_master
Normal file
@ -0,0 +1,9 @@
|
||||
$ git whatchanged -SF master
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
:100644 100644 8422d40... cead32e... M dir/sub
|
||||
$
|
||||
100
t/t4013/diff.whatchanged_-p_master
Normal file
100
t/t4013/diff.whatchanged_-p_master
Normal file
@ -0,0 +1,100 @@
|
||||
$ git whatchanged -p master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..7289e35 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..f4615da 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file3 b/file3
|
||||
new file mode 100644
|
||||
index 0000000..7289e35
|
||||
--- /dev/null
|
||||
+++ b/file3
|
||||
@@ -0,0 +1,4 @@
|
||||
+A
|
||||
+B
|
||||
+1
|
||||
+2
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 8422d40..cead32e 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -2,3 +2,5 @@ A
|
||||
B
|
||||
C
|
||||
D
|
||||
+E
|
||||
+F
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 35d242b..8422d40 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,2 +1,4 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
diff --git a/file0 b/file0
|
||||
index 01e79c3..b414108 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,3 +1,6 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
$
|
||||
30
t/t4013/diff.whatchanged_master
Normal file
30
t/t4013/diff.whatchanged_master
Normal file
@ -0,0 +1,30 @@
|
||||
$ git whatchanged master
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:03:00 2006 +0000
|
||||
|
||||
Side
|
||||
|
||||
:100644 100644 35d242b... 7289e35... M dir/sub
|
||||
:100644 100644 01e79c3... f4615da... M file0
|
||||
:000000 100644 0000000... 7289e35... A file3
|
||||
|
||||
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:02:00 2006 +0000
|
||||
|
||||
Third
|
||||
|
||||
:100644 100644 8422d40... cead32e... M dir/sub
|
||||
:000000 100644 0000000... b1e6722... A file1
|
||||
|
||||
commit 7952a93e09bf565b5592766a438b40cd81f4846f
|
||||
Author: A U Thor <author@example.com>
|
||||
Date: Mon Jun 26 00:01:00 2006 +0000
|
||||
|
||||
Second
|
||||
|
||||
:100644 100644 35d242b... 8422d40... M dir/sub
|
||||
:100644 100644 01e79c3... b414108... M file0
|
||||
:100644 000000 01e79c3... 0000000... D file2
|
||||
$
|
||||
Loading…
Reference in New Issue
Block a user