From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Jan 2011 21:31:25 +0000 (-0800)
Subject: Merge branch 'ao/t9001-fix'
X-Git-Tag: v1.7.4-rc1~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3cae60efcf28e3d498423b9d11dd772d424ddc9?ds=inline;hp=-c

Merge branch 'ao/t9001-fix'

* ao/t9001-fix:
t/t9001-send-email.sh: fix '&&' chain in some tests
---

d3cae60efcf28e3d498423b9d11dd772d424ddc9
diff --combined t/t9001-send-email.sh
index 3271426f79,2fb22d0fbc..579ddb7572
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@@ -265,7 -265,7 +265,7 @@@ test_expect_success $PREREQ 'Author Fro
  		--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 +276,7 @@@ test_expect_success $PREREQ 'Author Fro
  		--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 +298,7 @@@ test_expect_success $PREREQ 'Invalid In
  		--in-reply-to=" " \
  		--smtp-server="$(pwd)/fake.sendmail" \
  		$patches \
- 		2>errors
+ 		2>errors &&
  	! grep "^In-Reply-To: < *>" msgtxt1
  '
  
@@@ -319,7 -319,7 +319,7 @@@ test_expect_success $PREREQ 'In-Reply-T
  	git send-email \
  		--from="Example <nobody@example.com>" \
  		--to=nobody@example.com \
 -		--no-chain-reply-to \
 +		--nochain-reply-to \
  		--in-reply-to="$(cat expect)" \
  		--smtp-server="$(pwd)/fake.sendmail" \
  		$patches $patches $patches \
@@@ -617,7 -617,7 +617,7 @@@ EO
  "
  
  test_expect_success $PREREQ '--suppress-cc=sob' '
- 	git config --unset sendemail.cccmd
+ 	test_might_fail git config --unset sendemail.cccmd &&
  	test_suppression sob
  '
  
@@@ -1135,7 -1135,7 +1135,7 @@@ test_expect_success $PREREQ '--8bit-enc
  # Note that the patches in this test are deliberately out of order; we
  # want to make sure it works even if the cover-letter is not in the
  # first mail.
 -test_expect_success 'refusing to send cover letter template' '
 +test_expect_success $PREREQ 'refusing to send cover letter template' '
  	clean_fake_sendmail &&
  	rm -fr outdir &&
  	git format-patch --cover-letter -2 -o outdir &&
@@@ -1151,7 -1151,7 +1151,7 @@@
  	test -z "$(ls msgtxt*)"
  '
  
 -test_expect_success '--force sends cover letter template anyway' '
 +test_expect_success $PREREQ '--force sends cover letter template anyway' '
  	clean_fake_sendmail &&
  	rm -fr outdir &&
  	git format-patch --cover-letter -2 -o outdir &&