diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:31:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-05 13:31:25 -0800 |
| commit | d3cae60efcf28e3d498423b9d11dd772d424ddc9 (patch) | |
| tree | 62c4a3ad2598a5f102b8075ac14b5e3c8dfd23ba /t | |
| parent | 9e98354ab9717480e2e15b5ae56c10c3d5702a9b (diff) | |
| parent | cc7e81674b9fef94e64fe3e8c134f1a27ce2fa25 (diff) | |
| download | git-d3cae60efcf28e3d498423b9d11dd772d424ddc9.tar.gz | |
Merge branch 'ao/t9001-fix'
* ao/t9001-fix:
t/t9001-send-email.sh: fix '&&' chain in some tests
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9001-send-email.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 3271426f79..579ddb7572 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -265,7 +265,7 @@ test_expect_success $PREREQ 'Author From: in message body' ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ $patches && - sed "1,/^\$/d" < msgtxt1 > msgbody1 + sed "1,/^\$/d" < msgtxt1 > msgbody1 && grep "From: A <author@example.com>" msgbody1 ' @@ -276,7 +276,7 @@ test_expect_success $PREREQ 'Author From: not in message body' ' --to=nobody@example.com \ --smtp-server="$(pwd)/fake.sendmail" \ $patches && - sed "1,/^\$/d" < msgtxt1 > msgbody1 + sed "1,/^\$/d" < msgtxt1 > msgbody1 && ! grep "From: A <author@example.com>" msgbody1 ' @@ -298,7 +298,7 @@ test_expect_success $PREREQ 'Invalid In-Reply-To' ' --in-reply-to=" " \ --smtp-server="$(pwd)/fake.sendmail" \ $patches \ - 2>errors + 2>errors && ! grep "^In-Reply-To: < *>" msgtxt1 ' @@ -617,7 +617,7 @@ EOF " test_expect_success $PREREQ '--suppress-cc=sob' ' - git config --unset sendemail.cccmd + test_might_fail git config --unset sendemail.cccmd && test_suppression sob ' |