diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:27:41 -0800 |
| commit | 1cb4b3d380fe42a837adfb68126a312f605680f8 (patch) | |
| tree | a3051c8af64dda52e0c1b0c9826afa0d2d66515c /t | |
| parent | Merge branch 'po/doc-assume-unchanged' (diff) | |
| parent | index-pack: terminate object buffers with NUL (diff) | |
| download | tgif-1cb4b3d380fe42a837adfb68126a312f605680f8.tar.xz | |
Merge branch 'js/fsck-tag-validation'
New tag object format validation added in 2.2 showed garbage
after a tagname it reported in its error message.
* js/fsck-tag-validation:
index-pack: terminate object buffers with NUL
fsck: properly bound "invalid tag name" error message
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1450-fsck.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index d00b70f99d..1f04b8aa3f 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -229,8 +229,12 @@ test_expect_success 'tag with incorrect tag name & missing tagger' ' echo $tag >.git/refs/tags/wrong && test_when_finished "git update-ref -d refs/tags/wrong" && git fsck --tags 2>out && - grep "invalid .tag. name" out && - grep "expected .tagger. line" out + + cat >expect <<-EOF && + warning in tag $tag: invalid '\''tag'\'' name: wrong name format + warning in tag $tag: invalid format - expected '\''tagger'\'' line + EOF + test_cmp expect out ' test_expect_success 'tag with bad tagger' ' |