git-commit: populate the edit buffer with 2 blank lines before s-o-b

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 0ed899f0f2832e27b2203c074261f5be50d3e7a6..95af73f596b096fe8de94d4fd027a09d7401badb 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1045,7 +1045,28 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_failure 'signoff: some random signoff-alike' '
+test_expect_success 'signoff: misc conforming footer elements' '
+       append_signoff <<\EOF >actual &&
+subject
+
+body
+
+Signed-off-by: my@house
+(cherry picked from commit da39a3ee5e6b4b0d3255bfef95601890afd80709)
+Tested-by: Some One <someone@example.com>
+Bug: 1234
+EOF
+       cat >expected <<\EOF &&
+4:Subject: [PATCH] subject
+8:
+10:
+11:Signed-off-by: my@house
+15:Signed-off-by: C O Mitter <committer@example.com>
+EOF
+       test_cmp expected actual
+'
+
+test_expect_success 'signoff: some random signoff-alike' '
        append_signoff <<\EOF >actual &&
 subject
 
@@ -1061,7 +1082,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_failure 'signoff: not really a signoff' '
+test_expect_success 'signoff: not really a signoff' '
        append_signoff <<\EOF >actual &&
 subject
 
@@ -1077,7 +1098,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_failure 'signoff: not really a signoff (2)' '
+test_expect_success 'signoff: not really a signoff (2)' '
        append_signoff <<\EOF >actual &&
 subject
 
@@ -1094,7 +1115,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_failure 'signoff: valid S-o-b paragraph in the middle' '
+test_expect_success 'signoff: valid S-o-b paragraph in the middle' '
        append_signoff <<\EOF >actual &&
 subject
 
@@ -1162,7 +1183,7 @@ EOF
        test_cmp expected actual
 '
 
-test_expect_failure 'signoff: detect garbage in non-conforming footer' '
+test_expect_success 'signoff: detect garbage in non-conforming footer' '
        append_signoff <<\EOF >actual &&
 subject