diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:35:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-27 13:35:18 -0700 |
| commit | 319a36a5c2da8dd07993caac43b7820bff3b0d37 (patch) | |
| tree | dcf79cf682e76fca476ff7bea7024efda338807e /t | |
| parent | 8ee002fd3d875027f70729c0674282dc46fc5654 (diff) | |
| parent | 24362a5d3ffc5ef10ccbcd80b258a418a1c792b5 (diff) | |
| download | git-319a36a5c2da8dd07993caac43b7820bff3b0d37.tar.gz git-319a36a5c2da8dd07993caac43b7820bff3b0d37.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3800-mktag.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 278075823..bdc6e132c 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 ' } |