From d410e43b35a8044472606a7e7018aa64d96a5f0f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 29 Jun 2006 00:01:07 -0700 Subject: t4013: add format-patch tests. Signed-off-by: Junio C Hamano --- t/t4013/diff.format-patch_--stdout_initial..side | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 t/t4013/diff.format-patch_--stdout_initial..side (limited to 't/t4013/diff.format-patch_--stdout_initial..side') diff --git a/t/t4013/diff.format-patch_--stdout_initial..side b/t/t4013/diff.format-patch_--stdout_initial..side new file mode 100644 index 0000000000..e7ddbf4814 --- /dev/null +++ b/t/t4013/diff.format-patch_--stdout_initial..side @@ -0,0 +1,45 @@ +$ git format-patch --stdout initial..side +From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 +From: A U Thor +Date: Mon, 26 Jun 2006 00:03:00 +0000 +Subject: [PATCH] Side +--- + dir/sub | 2 ++ + file0 | 3 +++ + file3 | 4 ++++ + 3 files changed, 9 insertions(+), 0 deletions(-) + +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 +-- +g-i-t--v-e-r-s-i-o-n + +$ -- cgit v1.3 From 855409296d74d3e53fdaa3cdefd1171e4c950fab Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 13 Jul 2006 21:39:13 -0700 Subject: Adjust t4013 tests to corrected format-patch. Signed-off-by: Junio C Hamano --- t/t4013/diff.format-patch_--attach_--stdout_initial..master | 2 ++ t/t4013/diff.format-patch_--attach_--stdout_initial..master^ | 1 + t/t4013/diff.format-patch_--attach_--stdout_initial..side | 1 + t/t4013/diff.format-patch_--stdout_initial..master | 2 ++ t/t4013/diff.format-patch_--stdout_initial..master^ | 1 + t/t4013/diff.format-patch_--stdout_initial..side | 1 + 6 files changed, 8 insertions(+) (limited to 't/t4013/diff.format-patch_--stdout_initial..side') diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master b/t/t4013/diff.format-patch_--attach_--stdout_initial..master index 34af347d64..b4745e1001 100644 --- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master +++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master @@ -72,6 +72,7 @@ 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 + --- dir/sub | 2 ++ file1 | 3 +++ @@ -119,6 +120,7 @@ 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 + --- dir/sub | 2 ++ file0 | 3 +++ diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ index 3d57510037..a9d1cd368b 100644 --- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ +++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ @@ -72,6 +72,7 @@ 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 + --- dir/sub | 2 ++ file1 | 3 +++ diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..side b/t/t4013/diff.format-patch_--attach_--stdout_initial..side index 3769fa6daf..57b9d0bdc1 100644 --- a/t/t4013/diff.format-patch_--attach_--stdout_initial..side +++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..side @@ -11,6 +11,7 @@ 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 + --- dir/sub | 2 ++ file0 | 3 +++ diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..master index fe78b15309..c33302e92f 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..master +++ b/t/t4013/diff.format-patch_--stdout_initial..master @@ -48,6 +48,7 @@ From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 From: A U Thor Date: Mon, 26 Jun 2006 00:02:00 +0000 Subject: [PATCH] Third + --- dir/sub | 2 ++ file1 | 3 +++ @@ -80,6 +81,7 @@ From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 From: A U Thor Date: Mon, 26 Jun 2006 00:03:00 +0000 Subject: [PATCH] Side + --- dir/sub | 2 ++ file0 | 3 +++ diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^ index 4e87689507..03d0f9693c 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..master^ +++ b/t/t4013/diff.format-patch_--stdout_initial..master^ @@ -48,6 +48,7 @@ From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 From: A U Thor Date: Mon, 26 Jun 2006 00:02:00 +0000 Subject: [PATCH] Third + --- dir/sub | 2 ++ file1 | 3 +++ diff --git a/t/t4013/diff.format-patch_--stdout_initial..side b/t/t4013/diff.format-patch_--stdout_initial..side index e7ddbf4814..d10a46523b 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..side +++ b/t/t4013/diff.format-patch_--stdout_initial..side @@ -3,6 +3,7 @@ From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 From: A U Thor Date: Mon, 26 Jun 2006 00:03:00 +0000 Subject: [PATCH] Side + --- dir/sub | 2 ++ file0 | 3 +++ -- cgit v1.3