From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2010 19:17:17 +0000 (-0700)
Subject: Merge branch 'jh/use-test-must-fail'
X-Git-Tag: v1.7.3-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4265ee3e6e391709168cc507c1c9bb705392cdfe?hp=-c

Merge branch 'jh/use-test-must-fail'

* jh/use-test-must-fail:
Convert "! git" to "test_must_fail git"
---

4265ee3e6e391709168cc507c1c9bb705392cdfe
diff --combined t/t3301-notes.sh
index 1d82f79ee0,421c9884da..96b75813d7
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@@ -299,7 -299,7 +299,7 @@@ cat expect-F >> expect-rm-
  test_expect_success 'verify note removal with -F /dev/null' '
  	git log -4 > output &&
  	test_cmp expect-rm-F output &&
- 	! git notes show
+ 	test_must_fail git notes show
  '
  
  test_expect_success 'do not create empty note with -m "" (setup)' '
@@@ -309,7 -309,7 +309,7 @@@
  test_expect_success 'verify non-creation of note with -m ""' '
  	git log -4 > output &&
  	test_cmp expect-rm-F output &&
- 	! git notes show
+ 	test_must_fail git notes show
  '
  
  cat > expect-combine_m_and_F << EOF
@@@ -357,7 -357,7 +357,7 @@@ cat expect-multiline >> expect-rm-remov
  test_expect_success 'verify note removal with "git notes remove"' '
  	git log -4 > output &&
  	test_cmp expect-rm-remove output &&
- 	! git notes show HEAD^
+ 	test_must_fail git notes show HEAD^
  '
  
  cat > expect << EOF
@@@ -693,11 -693,7 +693,11 @@@ test_expect_success 'create note from n
  	git add a10 &&
  	test_tick &&
  	git commit -m 10th &&
 -	test_must_fail MSG="yet another note" git notes add -c deadbeef &&
 +	(
 +		MSG="yet another note" &&
 +		export MSG &&
 +		test_must_fail git notes add -c deadbeef
 +	) &&
  	test_must_fail git notes list HEAD
  '