@matheusbsbs / matheus-bagliano / commits / a40d384cac
Fork 0

t4013 diff format tests update

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>

Junio C Hamano committed Jul 13, 2006 at 19:51 UTC a40d384caca008c0334a35e9ac298f2eeb5decd2
42 files changed +161 -104
t/t4013-diff-various.sh
+4 -1
@@ -7,6 +7,9 @@ test_description='Various diff formatting options'
7
8 . ./test-lib.sh
9
10 +LF='
11 +'
12 +
13 test_expect_success setup '
14
15 GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
@@ -31,7 +34,7 @@ test_expect_success setup '
34 for i in C D; do echo $i; done >>dir/sub &&
35 rm -f file2 &&
36 git update-index --remove file0 file2 dir/sub &&
34 - git commit -m Second &&
37 + git commit -m "Second${LF}${LF}This is the second commit." &&
38
39 GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
40 GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&
t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree --cc --patch-with-stat --summary master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_--cc_--patch-with-stat_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree --cc --patch-with-stat master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_--cc_--stat_--summary_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree --cc --stat --summary master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_--cc_--stat_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree --cc --stat master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_--cc_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree --cc master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 diff --cc dir/sub
4 index cead32e,7289e35..992913c
5 --- a/dir/sub
t/t4013/diff.diff-tree_-c_--abbrev_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree -c --abbrev master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 ::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub
4 ::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0
5 $
t/t4013/diff.diff-tree_-c_--stat_--summary_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree -c --stat --summary master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_-c_--stat_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree -c --stat master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 dir/sub | 2 ++
4 file0 | 3 +++
5 2 files changed, 5 insertions(+), 0 deletions(-)
t/t4013/diff.diff-tree_-c_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git diff-tree -c master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 ::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
4 ::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
5 $
t/t4013/diff.diff-tree_-p_-m_master
+2 -2
@@ -1,5 +1,5 @@
1 $ git diff-tree -p -m master
2 -176b998f5d647cbd77a9d8acf4531e930754d16d
2 +59d314ad6f356dd08601a4cd5e530381da3e3c64
3 diff --git a/dir/sub b/dir/sub
4 index cead32e..992913c 100644
5 --- a/dir/sub
@@ -21,7 +21,7 @@ index b414108..10a8a9f 100644
21 +A
22 +B
23 +C
24 -176b998f5d647cbd77a9d8acf4531e930754d16d
24 +59d314ad6f356dd08601a4cd5e530381da3e3c64
25 diff --git a/dir/sub b/dir/sub
26 index 7289e35..992913c 100644
27 --- a/dir/sub
t/t4013/diff.format-patch_--attach_--stdout_initial..master
+9 -6
@@ -1,5 +1,5 @@
1 $ git format-patch --attach --stdout initial..master
2 -From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
2 +From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
@@ -11,6 +11,9 @@ This is a multi-part message in MIME format.
11 --------------g-i-t--v-e-r-s-i-o-n
12 Content-Type: text/plain; charset=UTF-8; format=fixed
13 Content-Transfer-Encoding: 8bit
14 +
15 +
16 +This is the second commit.
17 ---
18 dir/sub | 2 ++
19 file0 | 3 +++
@@ -18,10 +21,10 @@ Content-Transfer-Encoding: 8bit
21 3 files changed, 5 insertions(+), 3 deletions(-)
22 --------------g-i-t--v-e-r-s-i-o-n
23 Content-Type: text/x-patch;
21 - name="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
24 + name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
25 Content-Transfer-Encoding: 8bit
26 Content-Disposition: inline;
24 - filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
27 + filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
28
29 diff --git a/dir/sub b/dir/sub
30 index 35d242b..8422d40 100644
@@ -57,7 +60,7 @@ index 01e79c3..0000000
60
61
62
60 -From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
63 +From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
64 From: A U Thor <author@example.com>
65 Date: Mon, 26 Jun 2006 00:02:00 +0000
66 Subject: [PATCH] Third
@@ -75,10 +78,10 @@ Content-Transfer-Encoding: 8bit
78 2 files changed, 5 insertions(+), 0 deletions(-)
79 --------------g-i-t--v-e-r-s-i-o-n
80 Content-Type: text/x-patch;
78 - name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
81 + name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
82 Content-Transfer-Encoding: 8bit
83 Content-Disposition: inline;
81 - filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
84 + filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
85
86 diff --git a/dir/sub b/dir/sub
87 index 8422d40..cead32e 100644
t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+9 -6
@@ -1,5 +1,5 @@
1 $ git format-patch --attach --stdout initial..master^
2 -From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
2 +From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
@@ -11,6 +11,9 @@ This is a multi-part message in MIME format.
11 --------------g-i-t--v-e-r-s-i-o-n
12 Content-Type: text/plain; charset=UTF-8; format=fixed
13 Content-Transfer-Encoding: 8bit
14 +
15 +
16 +This is the second commit.
17 ---
18 dir/sub | 2 ++
19 file0 | 3 +++
@@ -18,10 +21,10 @@ Content-Transfer-Encoding: 8bit
21 3 files changed, 5 insertions(+), 3 deletions(-)
22 --------------g-i-t--v-e-r-s-i-o-n
23 Content-Type: text/x-patch;
21 - name="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
24 + name="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
25 Content-Transfer-Encoding: 8bit
26 Content-Disposition: inline;
24 - filename="7952a93e09bf565b5592766a438b40cd81f4846f.diff"
27 + filename="1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44.diff"
28
29 diff --git a/dir/sub b/dir/sub
30 index 35d242b..8422d40 100644
@@ -57,7 +60,7 @@ index 01e79c3..0000000
60
61
62
60 -From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
63 +From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
64 From: A U Thor <author@example.com>
65 Date: Mon, 26 Jun 2006 00:02:00 +0000
66 Subject: [PATCH] Third
@@ -75,10 +78,10 @@ Content-Transfer-Encoding: 8bit
78 2 files changed, 5 insertions(+), 0 deletions(-)
79 --------------g-i-t--v-e-r-s-i-o-n
80 Content-Type: text/x-patch;
78 - name="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
81 + name="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
82 Content-Transfer-Encoding: 8bit
83 Content-Disposition: inline;
81 - filename="889b315013ef9f2e2f90aa0b054b267c8a557847.diff"
84 + filename="9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0.diff"
85
86 diff --git a/dir/sub b/dir/sub
87 index 8422d40..cead32e 100644
t/t4013/diff.format-patch_--stdout_initial..master
+4 -2
@@ -1,8 +1,10 @@
1 $ git format-patch --stdout initial..master
2 -From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
2 +From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
6 +
7 +This is the second commit.
8 ---
9 dir/sub | 2 ++
10 file0 | 3 +++
@@ -42,7 +44,7 @@ index 01e79c3..0000000
44 g-i-t--v-e-r-s-i-o-n
45
46
45 -From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
47 +From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
48 From: A U Thor <author@example.com>
49 Date: Mon, 26 Jun 2006 00:02:00 +0000
50 Subject: [PATCH] Third
t/t4013/diff.format-patch_--stdout_initial..master^
+4 -2
@@ -1,8 +1,10 @@
1 $ git format-patch --stdout initial..master^
2 -From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
2 +From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
6 +
7 +This is the second commit.
8 ---
9 dir/sub | 2 ++
10 file0 | 3 +++
@@ -42,7 +44,7 @@ index 01e79c3..0000000
44 g-i-t--v-e-r-s-i-o-n
45
46
45 -From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
47 +From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
48 From: A U Thor <author@example.com>
49 Date: Mon, 26 Jun 2006 00:02:00 +0000
50 Subject: [PATCH] Third
t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --patch-with-stat --summary master -- dir/
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -25,7 +25,7 @@ index 35d242b..7289e35 100644
25 +1
26 +2
27
28 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
28 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
29 Author: A U Thor <author@example.com>
30 Date: Mon Jun 26 00:02:00 2006 +0000
31
@@ -45,11 +45,13 @@ index 8422d40..cead32e 100644
45 +E
46 +F
47
48 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
48 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
49 Author: A U Thor <author@example.com>
50 Date: Mon Jun 26 00:01:00 2006 +0000
51
52 Second
53 +
54 + This is the second commit.
55 ---
56 dir/sub | 2 ++
57 1 files changed, 2 insertions(+), 0 deletions(-)
t/t4013/diff.log_--patch-with-stat_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --patch-with-stat master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -48,7 +48,7 @@ index 0000000..7289e35
48 +1
49 +2
50
51 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
51 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
52 Author: A U Thor <author@example.com>
53 Date: Mon Jun 26 00:02:00 2006 +0000
54
@@ -78,11 +78,13 @@ index 0000000..b1e6722
78 +B
79 +C
80
81 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
81 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
82 Author: A U Thor <author@example.com>
83 Date: Mon Jun 26 00:01:00 2006 +0000
84
85 Second
86 +
87 + This is the second commit.
88 ---
89 dir/sub | 2 ++
90 file0 | 3 +++
t/t4013/diff.log_--patch-with-stat_master_--_dir_
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --patch-with-stat master -- dir/
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -25,7 +25,7 @@ index 35d242b..7289e35 100644
25 +1
26 +2
27
28 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
28 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
29 Author: A U Thor <author@example.com>
30 Date: Mon Jun 26 00:02:00 2006 +0000
31
@@ -45,11 +45,13 @@ index 8422d40..cead32e 100644
45 +E
46 +F
47
48 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
48 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
49 Author: A U Thor <author@example.com>
50 Date: Mon Jun 26 00:01:00 2006 +0000
51
52 Second
53 +
54 + This is the second commit.
55 ---
56 dir/sub | 2 ++
57 1 files changed, 2 insertions(+), 0 deletions(-)
t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root --cc --patch-with-stat --summary master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -81,7 +81,7 @@ index 0000000..7289e35
81 +1
82 +2
83
84 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
84 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
85 Author: A U Thor <author@example.com>
86 Date: Mon Jun 26 00:02:00 2006 +0000
87
@@ -112,11 +112,13 @@ index 0000000..b1e6722
112 +B
113 +C
114
115 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
115 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
116 Author: A U Thor <author@example.com>
117 Date: Mon Jun 26 00:01:00 2006 +0000
118
119 Second
120 +
121 + This is the second commit.
122 ---
123 dir/sub | 2 ++
124 file0 | 3 +++
t/t4013/diff.log_--root_--patch-with-stat_--summary_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root --patch-with-stat --summary master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -49,7 +49,7 @@ index 0000000..7289e35
49 +1
50 +2
51
52 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
52 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
53 Author: A U Thor <author@example.com>
54 Date: Mon Jun 26 00:02:00 2006 +0000
55
@@ -80,11 +80,13 @@ index 0000000..b1e6722
80 +B
81 +C
82
83 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
83 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
84 Author: A U Thor <author@example.com>
85 Date: Mon Jun 26 00:01:00 2006 +0000
86
87 Second
88 +
89 + This is the second commit.
90 ---
91 dir/sub | 2 ++
92 file0 | 3 +++
t/t4013/diff.log_--root_--patch-with-stat_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root --patch-with-stat master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -48,7 +48,7 @@ index 0000000..7289e35
48 +1
49 +2
50
51 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
51 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
52 Author: A U Thor <author@example.com>
53 Date: Mon Jun 26 00:02:00 2006 +0000
54
@@ -78,11 +78,13 @@ index 0000000..b1e6722
78 +B
79 +C
80
81 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
81 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
82 Author: A U Thor <author@example.com>
83 Date: Mon Jun 26 00:01:00 2006 +0000
84
85 Second
86 +
87 + This is the second commit.
88 ---
89 dir/sub | 2 ++
90 file0 | 3 +++
t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root -c --patch-with-stat --summary master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -81,7 +81,7 @@ index 0000000..7289e35
81 +1
82 +2
83
84 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
84 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
85 Author: A U Thor <author@example.com>
86 Date: Mon Jun 26 00:02:00 2006 +0000
87
@@ -112,11 +112,13 @@ index 0000000..b1e6722
112 +B
113 +C
114
115 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
115 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
116 Author: A U Thor <author@example.com>
117 Date: Mon Jun 26 00:01:00 2006 +0000
118
119 Second
120 +
121 + This is the second commit.
122 ---
123 dir/sub | 2 ++
124 file0 | 3 +++
t/t4013/diff.log_--root_-p_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root -p master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -43,7 +43,7 @@ index 0000000..7289e35
43 +1
44 +2
45
46 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
46 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
47 Author: A U Thor <author@example.com>
48 Date: Mon Jun 26 00:02:00 2006 +0000
49
@@ -69,11 +69,13 @@ index 0000000..b1e6722
69 +B
70 +C
71
72 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
72 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
73 Author: A U Thor <author@example.com>
74 Date: Mon Jun 26 00:01:00 2006 +0000
75
76 Second
77 +
78 + This is the second commit.
79
80 diff --git a/dir/sub b/dir/sub
81 index 35d242b..8422d40 100644
t/t4013/diff.log_--root_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log --root master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -12,17 +12,19 @@ Date: Mon Jun 26 00:03:00 2006 +0000
12
13 Side
14
15 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
15 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
16 Author: A U Thor <author@example.com>
17 Date: Mon Jun 26 00:02:00 2006 +0000
18
19 Third
20
21 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
21 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:01:00 2006 +0000
24
25 Second
26 +
27 + This is the second commit.
28
29 commit 444ac553ac7612cc88969031b02b3767fb8a353a
30 Author: A U Thor <author@example.com>
t/t4013/diff.log_-SF_-p_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git log -SF -p master
2 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
2 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
3 Author: A U Thor <author@example.com>
4 Date: Mon Jun 26 00:02:00 2006 +0000
5
t/t4013/diff.log_-SF_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git log -SF master
2 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
2 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
3 Author: A U Thor <author@example.com>
4 Date: Mon Jun 26 00:02:00 2006 +0000
5
t/t4013/diff.log_-p_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log -p master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -43,7 +43,7 @@ index 0000000..7289e35
43 +1
44 +2
45
46 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
46 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
47 Author: A U Thor <author@example.com>
48 Date: Mon Jun 26 00:02:00 2006 +0000
49
@@ -69,11 +69,13 @@ index 0000000..b1e6722
69 +B
70 +C
71
72 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
72 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
73 Author: A U Thor <author@example.com>
74 Date: Mon Jun 26 00:01:00 2006 +0000
75
76 Second
77 +
78 + This is the second commit.
79
80 diff --git a/dir/sub b/dir/sub
81 index 35d242b..8422d40 100644
t/t4013/diff.log_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git log master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -12,17 +12,19 @@ Date: Mon Jun 26 00:03:00 2006 +0000
12
13 Side
14
15 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
15 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
16 Author: A U Thor <author@example.com>
17 Date: Mon Jun 26 00:02:00 2006 +0000
18
19 Third
20
21 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
21 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:01:00 2006 +0000
24
25 Second
26 +
27 + This is the second commit.
28
29 commit 444ac553ac7612cc88969031b02b3767fb8a353a
30 Author: A U Thor <author@example.com>
t/t4013/diff.show_master
+2 -2
@@ -1,6 +1,6 @@
1 $ git show master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
+4 -2
@@ -18,7 +18,7 @@ index 35d242b..7289e35 100644
18 +1
19 +2
20
21 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
21 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:02:00 2006 +0000
24
@@ -38,11 +38,13 @@ index 8422d40..cead32e 100644
38 +E
39 +F
40
41 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
41 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
42 Author: A U Thor <author@example.com>
43 Date: Mon Jun 26 00:01:00 2006 +0000
44
45 Second
46 +
47 + This is the second commit.
48 ---
49 dir/sub | 2 ++
50 1 files changed, 2 insertions(+), 0 deletions(-)
t/t4013/diff.whatchanged_--patch-with-stat_master
+4 -2
@@ -41,7 +41,7 @@ index 0000000..7289e35
41 +1
42 +2
43
44 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
44 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
45 Author: A U Thor <author@example.com>
46 Date: Mon Jun 26 00:02:00 2006 +0000
47
@@ -71,11 +71,13 @@ index 0000000..b1e6722
71 +B
72 +C
73
74 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
74 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
75 Author: A U Thor <author@example.com>
76 Date: Mon Jun 26 00:01:00 2006 +0000
77
78 Second
79 +
80 + This is the second commit.
81 ---
82 dir/sub | 2 ++
83 file0 | 3 +++
t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
+4 -2
@@ -18,7 +18,7 @@ index 35d242b..7289e35 100644
18 +1
19 +2
20
21 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
21 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:02:00 2006 +0000
24
@@ -38,11 +38,13 @@ index 8422d40..cead32e 100644
38 +E
39 +F
40
41 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
41 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
42 Author: A U Thor <author@example.com>
43 Date: Mon Jun 26 00:01:00 2006 +0000
44
45 Second
46 +
47 + This is the second commit.
48 ---
49 dir/sub | 2 ++
50 1 files changed, 2 insertions(+), 0 deletions(-)
t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git whatchanged --root --cc --patch-with-stat --summary master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -81,7 +81,7 @@ index 0000000..7289e35
81 +1
82 +2
83
84 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
84 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
85 Author: A U Thor <author@example.com>
86 Date: Mon Jun 26 00:02:00 2006 +0000
87
@@ -112,11 +112,13 @@ index 0000000..b1e6722
112 +B
113 +C
114
115 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
115 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
116 Author: A U Thor <author@example.com>
117 Date: Mon Jun 26 00:01:00 2006 +0000
118
119 Second
120 +
121 + This is the second commit.
122 ---
123 dir/sub | 2 ++
124 file0 | 3 +++
t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
+4 -2
@@ -42,7 +42,7 @@ index 0000000..7289e35
42 +1
43 +2
44
45 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
45 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
46 Author: A U Thor <author@example.com>
47 Date: Mon Jun 26 00:02:00 2006 +0000
48
@@ -73,11 +73,13 @@ index 0000000..b1e6722
73 +B
74 +C
75
76 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
76 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
77 Author: A U Thor <author@example.com>
78 Date: Mon Jun 26 00:01:00 2006 +0000
79
80 Second
81 +
82 + This is the second commit.
83 ---
84 dir/sub | 2 ++
85 file0 | 3 +++
t/t4013/diff.whatchanged_--root_--patch-with-stat_master
+4 -2
@@ -41,7 +41,7 @@ index 0000000..7289e35
41 +1
42 +2
43
44 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
44 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
45 Author: A U Thor <author@example.com>
46 Date: Mon Jun 26 00:02:00 2006 +0000
47
@@ -71,11 +71,13 @@ index 0000000..b1e6722
71 +B
72 +C
73
74 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
74 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
75 Author: A U Thor <author@example.com>
76 Date: Mon Jun 26 00:01:00 2006 +0000
77
78 Second
79 +
80 + This is the second commit.
81 ---
82 dir/sub | 2 ++
83 file0 | 3 +++
t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+6 -4
@@ -1,6 +1,6 @@
1 $ git whatchanged --root -c --patch-with-stat --summary master
2 -commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 -Merge: 889b315... c7a2ab9...
2 +commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3 +Merge: 9a6d494... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
6
@@ -81,7 +81,7 @@ index 0000000..7289e35
81 +1
82 +2
83
84 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
84 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
85 Author: A U Thor <author@example.com>
86 Date: Mon Jun 26 00:02:00 2006 +0000
87
@@ -112,11 +112,13 @@ index 0000000..b1e6722
112 +B
113 +C
114
115 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
115 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
116 Author: A U Thor <author@example.com>
117 Date: Mon Jun 26 00:01:00 2006 +0000
118
119 Second
120 +
121 + This is the second commit.
122 ---
123 dir/sub | 2 ++
124 file0 | 3 +++
t/t4013/diff.whatchanged_--root_-p_master
+4 -2
@@ -36,7 +36,7 @@ index 0000000..7289e35
36 +1
37 +2
38
39 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
39 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
40 Author: A U Thor <author@example.com>
41 Date: Mon Jun 26 00:02:00 2006 +0000
42
@@ -62,11 +62,13 @@ index 0000000..b1e6722
62 +B
63 +C
64
65 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
65 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
66 Author: A U Thor <author@example.com>
67 Date: Mon Jun 26 00:01:00 2006 +0000
68
69 Second
70 +
71 + This is the second commit.
72
73 diff --git a/dir/sub b/dir/sub
74 index 35d242b..8422d40 100644
t/t4013/diff.whatchanged_--root_master
+4 -2
@@ -9,7 +9,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
9 :100644 100644 01e79c3... f4615da... M file0
10 :000000 100644 0000000... 7289e35... A file3
11
12 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
12 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
13 Author: A U Thor <author@example.com>
14 Date: Mon Jun 26 00:02:00 2006 +0000
15
@@ -18,11 +18,13 @@ Date: Mon Jun 26 00:02:00 2006 +0000
18 :100644 100644 8422d40... cead32e... M dir/sub
19 :000000 100644 0000000... b1e6722... A file1
20
21 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
21 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:01:00 2006 +0000
24
25 Second
26 +
27 + This is the second commit.
28
29 :100644 100644 35d242b... 8422d40... M dir/sub
30 :100644 100644 01e79c3... b414108... M file0
t/t4013/diff.whatchanged_-SF_-p_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git whatchanged -SF -p master
2 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
2 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
3 Author: A U Thor <author@example.com>
4 Date: Mon Jun 26 00:02:00 2006 +0000
5
t/t4013/diff.whatchanged_-SF_master
+1 -1
@@ -1,5 +1,5 @@
1 $ git whatchanged -SF master
2 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
2 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
3 Author: A U Thor <author@example.com>
4 Date: Mon Jun 26 00:02:00 2006 +0000
5
t/t4013/diff.whatchanged_-p_master
+4 -2
@@ -36,7 +36,7 @@ index 0000000..7289e35
36 +1
37 +2
38
39 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
39 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
40 Author: A U Thor <author@example.com>
41 Date: Mon Jun 26 00:02:00 2006 +0000
42
@@ -62,11 +62,13 @@ index 0000000..b1e6722
62 +B
63 +C
64
65 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
65 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
66 Author: A U Thor <author@example.com>
67 Date: Mon Jun 26 00:01:00 2006 +0000
68
69 Second
70 +
71 + This is the second commit.
72
73 diff --git a/dir/sub b/dir/sub
74 index 35d242b..8422d40 100644
t/t4013/diff.whatchanged_master
+4 -2
@@ -9,7 +9,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
9 :100644 100644 01e79c3... f4615da... M file0
10 :000000 100644 0000000... 7289e35... A file3
11
12 -commit 889b315013ef9f2e2f90aa0b054b267c8a557847
12 +commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
13 Author: A U Thor <author@example.com>
14 Date: Mon Jun 26 00:02:00 2006 +0000
15
@@ -18,11 +18,13 @@ Date: Mon Jun 26 00:02:00 2006 +0000
18 :100644 100644 8422d40... cead32e... M dir/sub
19 :000000 100644 0000000... b1e6722... A file1
20
21 -commit 7952a93e09bf565b5592766a438b40cd81f4846f
21 +commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
22 Author: A U Thor <author@example.com>
23 Date: Mon Jun 26 00:01:00 2006 +0000
24
25 Second
26 +
27 + This is the second commit.
28
29 :100644 100644 35d242b... 8422d40... M dir/sub
30 :100644 100644 01e79c3... b414108... M file0