diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-29 11:24:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-29 11:24:36 -0700 |
commit | c9eaaab4165d8f402930d12899ec097495b599e6 (patch) | |
tree | a2a87dcdeb059a2b1de7090380564e524e4e78fb /t | |
parent | 1ba5c532e1f6ede63fd46bf6b647e70baa10a364 (diff) | |
parent | a1463920565c67646507dc573d3f5280fa4cdcf3 (diff) | |
download | git-c9eaaab4165d8f402930d12899ec097495b599e6.tar.gz |
Sync with 1.7.1.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t9001-send-email.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0b8a591507..382ab6c98a 100755 --- 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 "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 ' |