mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-10-31 22:37:54 +01:00

155 lines

2.3 KiB

Text

Raw Normal View History

t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00			`$ 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 ++++`
Use correct grammar in diffstat summary line "git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-02-01 13:55:07 +01:00			`3 files changed, 9 insertions(+)`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00
			`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`

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> 2006-07-14 04:51:12 +02:00			`commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:02:00 2006 +0000`

			`Third`
			`---`
			`dir/sub \| 2 ++`
			`file1 \| 3 +++`
Use correct grammar in diffstat summary line "git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-02-01 13:55:07 +01:00			`2 files changed, 5 insertions(+)`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00
			`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`

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> 2006-07-14 04:51:12 +02:00			`commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:01:00 2006 +0000`

			`Second`
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> 2006-07-14 04:51:12 +02:00
			`This is the second commit.`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00			`---`
			`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 +++`
Use correct grammar in diffstat summary line "git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-02-01 13:55:07 +01:00			`3 files changed, 8 insertions(+)`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-26 22:46:52 +02:00
			`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`
			`$`