Skip to content

Commit a40d384

Browse files
author
Junio C Hamano
committed
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>
1 parent 5716e79 commit a40d384

File tree

42 files changed

+161
-104
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+161
-104
lines changed

‎t/t4013-diff-various.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ test_description='Various diff formatting options'
77

88
. ./test-lib.sh
99

10+
LF='
11+
'
12+
1013
test_expect_success setup '
1114
1215
GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
@@ -31,7 +34,7 @@ test_expect_success setup '
3134
for i in C D; do echo $i; done >>dir/sub &&
3235
rm -f file2 &&
3336
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." &&
3538
3639
GIT_AUTHOR_DATE="2006-06-26 00:02:00 +0000" &&
3740
GIT_COMMITTER_DATE="2006-06-26 00:02:00 +0000" &&

‎t/t4013/diff.diff-tree_--cc_--patch-with-stat_--summary_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree --cc --patch-with-stat --summary master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree --cc --patch-with-stat master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

‎t/t4013/diff.diff-tree_--cc_--stat_--summary_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree --cc --stat --summary master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

‎t/t4013/diff.diff-tree_--cc_--stat_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree --cc --stat master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

‎t/t4013/diff.diff-tree_--cc_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree --cc master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
diff --cc dir/sub
44
index cead32e,7289e35..992913c
55
--- a/dir/sub

‎t/t4013/diff.diff-tree_-c_--abbrev_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree -c --abbrev master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
::100644 100644 100644 cead32e... 7289e35... 992913c... MM dir/sub
44
::100644 100644 100644 b414108... f4615da... 10a8a9f... MM file0
55
$

‎t/t4013/diff.diff-tree_-c_--stat_--summary_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree -c --stat --summary master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

‎t/t4013/diff.diff-tree_-c_--stat_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree -c --stat master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
dir/sub | 2 ++
44
file0 | 3 +++
55
2 files changed, 5 insertions(+), 0 deletions(-)

‎t/t4013/diff.diff-tree_-c_master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
$ git diff-tree -c master
2-
176b998f5d647cbd77a9d8acf4531e930754d16d
2+
59d314ad6f356dd08601a4cd5e530381da3e3c64
33
::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub
44
::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0
55
$

0 commit comments

Comments
 (0)