Andrew's git / gitweb.git / diff
?
t/t9001: use egrep when regular expressions are involved
authorBrandon Casey <drafnel@gmail.com>
Mon, 28 Jun 2010 22:46:22 +0000 (17:46 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jun 2010 16:31:48 +0000 (09:31 -0700)
Supplying backslashed, extended regular expressions to grep is not
portable. Use egrep instead.

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9001-send-email.sh patch | blob | history
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 0b8a5915070b7064c24045d666837d996d9d4946..382ab6c98a932925db838b29d452b36cfea0dba5 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -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 "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
 '
 
        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 &&
        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
 '
 
        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 &&
                        --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
 '
 
        test_cmp actual content-type-decl
 '