Merge branch 'eb/mailinfo' into next

diff --git a/t/t4113-apply-ending.sh b/t/t4113-apply-ending.sh
index d021ae84c3d64c8afe7ea563b78619ccd06214d7..7fd0cf62ecd1bc0723f8ad7b619e8df4afcb0acc 100755 (executable)
--- a/t/t4113-apply-ending.sh
+++ b/t/t4113-apply-ending.sh
@@ -29,7 +29,25 @@ test_expect_success setup \
 
 # test
 
-test_expect_failure apply \
+test_expect_failure 'apply at the end' \
     'git-apply --index test-patch'
 
+cat >test-patch <<\EOF
+diff a/file b/file
+--- a/file
++++ b/file
+@@ -1,2 +1,3 @@
++a
+ b
+ c
+EOF
+
+echo >file 'a
+b
+c'
+git-update-index file
+
+test_expect_failure 'apply at the beginning' \
+       'git-apply --index test-patch'
+
 test_done