Merge branch 'maint'

diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index db96064f67a8e72ad3f33d9608f8b1d1e9894279..d2c930de87f721a0e876351e511295ae0b094108 100755 (executable)
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -94,7 +94,7 @@ index e69de29..6178079 100644
 +b
 EOF
 
-test_expect_failure 'patch-id handles no-nl-at-eof markers' '
+test_expect_success 'patch-id handles no-nl-at-eof markers' '
        cat nonl | calc_patch_id nonl &&
        cat withnl | calc_patch_id withnl &&
        test_cmp patch-id_nonl patch-id_withnl