Merge branch 'maint'

* maint:
  Update draft release notes for 1.5.4.5
  Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
  t/t3800-mktag.sh: use test_must_fail rather than '!'

Conflicts:

	t/t3800-mktag.sh

1 files changed, 1 insertions, 1 deletions

diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 278075823b..bdc6e132ca 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -14,7 +14,7 @@ test_description='git-mktag: tag object verify test'
 check_verify_failure () {
 	expect="$2"
 	test_expect_success "$1" '
-		( ! git-mktag <tag.sig 2>message ) &&
+		( test_must_fail git-mktag <tag.sig 2>message ) &&
 		grep "$expect" message
 	'
 }