undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t4013 diff format tests update

Browse Source 
This changes one test commit in the sequence to have more than
one lines of commit log.  A few output formats (--pretty=email
aka format-patch and --pretty=oneline) need to behave
differently on single and multi-line log, and this change will
help catching breakages.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-07-13 19:51:12 -07:00
parent 5716e794bf
commit a40d384cac
42 changed files with 161 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/t4013-diff-various.sh
View File

@ -7,6 +7,9 @@ test_description='Various diff formatting options'
. ./test-lib.sh
LF='
'
test_expect_success setup '
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
@ -31,7 +34,7 @@ test_expect_success setup '
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 commit -m "Second${LF}${LF}This is the second commit." &&
GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&

2
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
View File

@ -1,5 +1,5 @@
$ git diff-tree --cc --patch-with-stat --summary master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
View File

@ -1,5 +1,5 @@
$ git diff-tree --cc --patch-with-stat master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
View File

@ -1,5 +1,5 @@
$ git diff-tree --cc --stat --summary master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_--cc_--stat_master
View File

@ -1,5 +1,5 @@
$ git diff-tree --cc --stat master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_--cc_master
View File

@ -1,5 +1,5 @@
$ git diff-tree --cc master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub

2
t/t4013/diff.diff-tree_-c_--abbrev_master
View File

@ -1,5 +1,5 @@
$ git diff-tree -c --abbrev master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub
::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0
$

2
t/t4013/diff.diff-tree_-c_--stat_--summary_master
View File

@ -1,5 +1,5 @@
$ git diff-tree -c --stat --summary master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_-c_--stat_master
View File

@ -1,5 +1,5 @@
$ git diff-tree -c --stat master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
dir/sub | 2 ++
file0 | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)

2
t/t4013/diff.diff-tree_-c_master
View File

@ -1,5 +1,5 @@
$ git diff-tree -c master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
$

4
t/t4013/diff.diff-tree_-p_-m_master
View File

@ -1,5 +1,5 @@
$ git diff-tree -p -m master
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644
--- a/dir/sub
@ -21,7 +21,7 @@ index b414108..10a8a9f 100644
+A
+B
+C
176b998f5d647cbd77a9d8acf4531e930754d16d
59d314ad6f356dd08601a4cd5e530381da3e3c64
diff --git a/dir/sub b/dir/sub
index 7289e35..992913c 100644
--- a/dir/sub

15
t/t4013/diff.format-patch_--attach_--stdout_initial..master
View File

@ -1,5 +1,5 @@
$ git format-patch --attach --stdout initial..master
From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:01:00 +0000
Subject: [PATCH] Second
@ -11,6 +11,9 @@ This is a multi-part message in MIME format.
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++
@ -18,10 +21,10 @@ Content-Transfer-Encoding: 8bit
3 files changed, 5 insertions(+), 3 deletions(-)
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/x-patch;
name="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@ -57,7 +60,7 @@ index 01e79c3..0000000
From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:02:00 +0000
Subject: [PATCH] Third
@ -75,10 +78,10 @@ Content-Transfer-Encoding: 8bit
2 files changed, 5 insertions(+), 0 deletions(-)
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/x-patch;
name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644

15
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
View File

@ -1,5 +1,5 @@
$ git format-patch --attach --stdout initial..master^
From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:01:00 +0000
Subject: [PATCH] Second
@ -11,6 +11,9 @@ This is a multi-part message in MIME format.
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++
@ -18,10 +21,10 @@ Content-Transfer-Encoding: 8bit
3 files changed, 5 insertions(+), 3 deletions(-)
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/x-patch;
name="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644
@ -57,7 +60,7 @@ index 01e79c3..0000000
From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:02:00 +0000
Subject: [PATCH] Third
@ -75,10 +78,10 @@ Content-Transfer-Encoding: 8bit
2 files changed, 5 insertions(+), 0 deletions(-)
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/x-patch;
name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
diff --git a/dir/sub b/dir/sub
index 8422d40..cead32e 100644

6
t/t4013/diff.format-patch_--stdout_initial..master
View File

@ -1,8 +1,10 @@
$ git format-patch --stdout initial..master
From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:01:00 +0000
Subject: [PATCH] Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++
@ -42,7 +44,7 @@ index 01e79c3..0000000
g-i-t--v-e-r-s-i-o-n
From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:02:00 +0000
Subject: [PATCH] Third

6
t/t4013/diff.format-patch_--stdout_initial..master^
View File

@ -1,8 +1,10 @@
$ git format-patch --stdout initial..master^
From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:01:00 +0000
Subject: [PATCH] Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++
@ -42,7 +44,7 @@ index 01e79c3..0000000
g-i-t--v-e-r-s-i-o-n
From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:02:00 +0000
Subject: [PATCH] Third

10
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
View File

@ -1,6 +1,6 @@
$ git log --patch-with-stat --summary master -- dir/
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -25,7 +25,7 @@ index 35d242b..7289e35 100644
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -45,11 +45,13 @@ index 8422d40..cead32e 100644
+E
+F
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

10
t/t4013/diff.log_--patch-with-stat_master
View File

@ -1,6 +1,6 @@
$ git log --patch-with-stat master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -48,7 +48,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -78,11 +78,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.log_--patch-with-stat_master_--_dir_
View File

@ -1,6 +1,6 @@
$ git log --patch-with-stat master -- dir/
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -25,7 +25,7 @@ index 35d242b..7289e35 100644
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -45,11 +45,13 @@ index 8422d40..cead32e 100644
+E
+F
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

10
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
View File

@ -1,6 +1,6 @@
$ git log --root --cc --patch-with-stat --summary master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -81,7 +81,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -112,11 +112,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
View File

@ -1,6 +1,6 @@
$ git log --root --patch-with-stat --summary master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -49,7 +49,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -80,11 +80,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.log_--root_--patch-with-stat_master
View File

@ -1,6 +1,6 @@
$ git log --root --patch-with-stat master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -48,7 +48,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -78,11 +78,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
View File

@ -1,6 +1,6 @@
$ git log --root -c --patch-with-stat --summary master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -81,7 +81,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -112,11 +112,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.log_--root_-p_master
View File

@ -1,6 +1,6 @@
$ git log --root -p master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -43,7 +43,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -69,11 +69,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644

10
t/t4013/diff.log_--root_master
View File

@ -1,6 +1,6 @@
$ git log --root master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -12,17 +12,19 @@ Date: Mon Jun 26 00:03:00 2006 +0000
Side
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
Third
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
commit 444ac553ac7612cc88969031b02b3767fb8a353a
Author: A U Thor <author@example.com>

2
t/t4013/diff.log_-SF_-p_master
View File

@ -1,5 +1,5 @@
$ git log -SF -p master
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000

2
t/t4013/diff.log_-SF_master
View File

@ -1,5 +1,5 @@
$ git log -SF master
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000

10
t/t4013/diff.log_-p_master
View File

@ -1,6 +1,6 @@
$ git log -p master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -43,7 +43,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -69,11 +69,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644

10
t/t4013/diff.log_master
View File

@ -1,6 +1,6 @@
$ git log master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -12,17 +12,19 @@ Date: Mon Jun 26 00:03:00 2006 +0000
Side
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
Third
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
commit 444ac553ac7612cc88969031b02b3767fb8a353a
Author: A U Thor <author@example.com>

4
t/t4013/diff.show_master
View File

@ -1,6 +1,6 @@
$ git show master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000

6
t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
View File

@ -18,7 +18,7 @@ index 35d242b..7289e35 100644
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -38,11 +38,13 @@ index 8422d40..cead32e 100644
+E
+F
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

6
t/t4013/diff.whatchanged_--patch-with-stat_master
View File

@ -41,7 +41,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -71,11 +71,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

6
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
View File

@ -18,7 +18,7 @@ index 35d242b..7289e35 100644
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -38,11 +38,13 @@ index 8422d40..cead32e 100644
+E
+F
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

10
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
View File

@ -1,6 +1,6 @@
$ git whatchanged --root --cc --patch-with-stat --summary master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -81,7 +81,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -112,11 +112,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

6
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
View File

@ -42,7 +42,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -73,11 +73,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

6
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
View File

@ -41,7 +41,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -71,11 +71,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

10
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
View File

@ -1,6 +1,6 @@
$ git whatchanged --root -c --patch-with-stat --summary master
commit 176b998f5d647cbd77a9d8acf4531e930754d16d
Merge: 889b315... c7a2ab9...
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494... c7a2ab9...
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000
@ -81,7 +81,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -112,11 +112,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++

6
t/t4013/diff.whatchanged_--root_-p_master
View File

@ -36,7 +36,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -62,11 +62,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644

6
t/t4013/diff.whatchanged_--root_master
View File

@ -9,7 +9,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
:100644 100644 01e79c3... f4615da... M file0
:000000 100644 0000000... 7289e35... A file3
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -18,11 +18,13 @@ Date: Mon Jun 26 00:02:00 2006 +0000
:100644 100644 8422d40... cead32e... M dir/sub
:000000 100644 0000000... b1e6722... A file1
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
:100644 100644 35d242b... 8422d40... M dir/sub
:100644 100644 01e79c3... b414108... M file0

2
t/t4013/diff.whatchanged_-SF_-p_master
View File

@ -1,5 +1,5 @@
$ git whatchanged -SF -p master
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000

2
t/t4013/diff.whatchanged_-SF_master
View File

@ -1,5 +1,5 @@
$ git whatchanged -SF master
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000

6
t/t4013/diff.whatchanged_-p_master
View File

@ -36,7 +36,7 @@ index 0000000..7289e35
+1
+2
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -62,11 +62,13 @@ index 0000000..b1e6722
+B
+C
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
diff --git a/dir/sub b/dir/sub
index 35d242b..8422d40 100644

6
t/t4013/diff.whatchanged_master
View File

@ -9,7 +9,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
:100644 100644 01e79c3... f4615da... M file0
:000000 100644 0000000... 7289e35... A file3
commit 889b315013ef9f2e2f90aa0b054b267c8a557847
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@ -18,11 +18,13 @@ Date: Mon Jun 26 00:02:00 2006 +0000
:100644 100644 8422d40... cead32e... M dir/sub
:000000 100644 0000000... b1e6722... A file1
commit 7952a93e09bf565b5592766a438b40cd81f4846f
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
This is the second commit.
:100644 100644 35d242b... 8422d40... M dir/sub
:100644 100644 01e79c3... b414108... M file0