Merge branch 'maint'

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 0b8a5915070b7064c24045d666837d996d9d4946..23597cc40751addd1473acd2edf7563e0a517c9e 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -4,7 +4,7 @@ test_description='git send-email'
 . ./test-lib.sh
 
 if ! test_have_prereq PERL; then
-       say 'skipping git send-email tests, perl not available'
+       skip_all='skipping git send-email tests, perl not available'
        test_done
 fi
 
@@ -58,7 +58,7 @@ test_no_confirm () {
 # Exit immediately to prevent hang if a no-confirm test fails
 check_no_confirm () {
        test -f no_confirm_okay || {
-               say 'No confirm test failed; skipping remaining tests to prevent hanging'
+               skip_all='confirm test failed; skipping remaining tests to prevent hanging'
                test_done
        }
 }
@@ -943,7 +943,7 @@ test_expect_success 'asks about and fixes 8bit encodings' '
        grep "do not declare a Content-Transfer-Encoding" stdout &&
        grep email-using-8bit stdout &&
        grep "Which 8bit encoding" stdout &&
-       grep "Content\\|MIME" msgtxt1 >actual &&
+       egrep "Content|MIME" msgtxt1 >actual &&
        test_cmp actual content-type-decl
 '
 
@@ -954,7 +954,7 @@ test_expect_success 'sendemail.8bitEncoding works' '
        git send-email --from=author@example.com --to=nobody@example.com \
                        --smtp-server="$(pwd)/fake.sendmail" \
                        email-using-8bit >stdout &&
-       grep "Content\\|MIME" msgtxt1 >actual &&
+       egrep "Content|MIME" msgtxt1 >actual &&
        test_cmp actual content-type-decl
 '
 
@@ -966,7 +966,7 @@ test_expect_success '--8bit-encoding overrides sendemail.8bitEncoding' '
                        --smtp-server="$(pwd)/fake.sendmail" \
                        --8bit-encoding=UTF-8 \
                        email-using-8bit >stdout &&
-       grep "Content\\|MIME" msgtxt1 >actual &&
+       egrep "Content|MIME" msgtxt1 >actual &&
        test_cmp actual content-type-decl
 '