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

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-01 14:57:52 +01:00

116 lines

1.7 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 log -p master`
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 59d314ad6f356dd08601a4cd5e530381da3e3c64`
log: do not print ellipses with --abbrev-commit 'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-02-13 23:10:41 +01:00			`Merge: 9a6d494 c7a2ab9`
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: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`

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`

			`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
			`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`
			`$`