Merge branch 'ab/mediawiki-name-truncation'

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index ec5f530102c04080b9d199269583cac9ab924c7e..591f35daaf5825cfdcf8e7fccf4f52462bbf8f78 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -544,7 +544,7 @@ Signed-off-by: A U Thor
 EOF
 
 unfold () {
-       perl -0pe 's/\n\s+/ /'
+       perl -0pe 's/\n\s+/ /g'
 }
 
 test_expect_success 'set up trailer tests' '
@@ -588,8 +588,8 @@ test_expect_success '%(trailers:unfold) unfolds trailers' '
 '
 
 test_expect_success ':only and :unfold work together' '
-       git log --no-walk --pretty="%(trailers:only:unfold)" >actual &&
-       git log --no-walk --pretty="%(trailers:unfold:only)" >reverse &&
+       git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
+       git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
        test_cmp actual reverse &&
        {
                grep -v patch.description <trailers | unfold &&