Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New tests and en-passant modifications to mktag.
These changes were originally part of the next patch, but have been
split out since they were peripheral to the main purpose of that patch.
- update comment describing the signature format to reflect
the current code.
- remove trailing \n in calls to error(), since a \n is already
provided by error().
- remove redundant call to get_sha1_hex().
- call sha1_to_hex(sha1) to convert to ascii, rather than attempting
to print the raw sha1.
The new tests provide a regression suite to support the modifications
to git-mktag in this and the next patch.
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>- Loading branch information
Ramsay Allan Jones
authored and
Junio C Hamano
committed
Aug 2, 2006
1 parent
7ffe709
commit 446c6fa
Showing
2 changed files
with
245 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| #!/bin/sh | ||
| # | ||
| # | ||
|
|
||
| test_description='git-mktag: tag object verify test' | ||
|
|
||
| . ./test-lib.sh | ||
|
|
||
| ########################################################### | ||
| # check the tag.sig file, expecting verify_tag() to fail, | ||
| # and checking that the error message matches the pattern | ||
| # given in the expect.pat file. | ||
|
|
||
| check_verify_failure () { | ||
| test_expect_success \ | ||
| "$1" \ | ||
| 'git-mktag <tag.sig 2>message || | ||
| egrep -q -f expect.pat message' | ||
| } | ||
|
|
||
| ########################################################### | ||
| # first create a commit, so we have a valid object/type | ||
| # for the tag. | ||
| echo Hello >A | ||
| git-update-index --add A | ||
| git-commit -m "Initial commit" | ||
| head=$(git-rev-parse --verify HEAD) | ||
|
|
||
| ############################################################ | ||
| # 1. length check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| too short for a tag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: .*size wrong.*$ | ||
| EOF | ||
|
|
||
| check_verify_failure 'Tag object length check' | ||
|
|
||
| ############################################################ | ||
| # 2. object line label check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| xxxxxx 139e9b33986b1c2670fff52c5067603117b3e895 | ||
| type tag | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char0: .*"object "$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"object" line label check' | ||
|
|
||
| ############################################################ | ||
| # 3. object line SHA1 check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object zz9e9b33986b1c2670fff52c5067603117b3e895 | ||
| type tag | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char7: .*SHA1 hash$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"object" line SHA1 check' | ||
|
|
||
| ############################################################ | ||
| # 4. type line label check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object 779e9b33986b1c2670fff52c5067603117b3e895 | ||
| xxxx tag | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char47: .*"[\]ntype "$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"type" line label check' | ||
|
|
||
| ############################################################ | ||
| # 5. type line eol check | ||
|
|
||
| echo "object 779e9b33986b1c2670fff52c5067603117b3e895" >tag.sig | ||
| echo -n "type tagsssssssssssssssssssssssssssssss" >>tag.sig | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char48: .*"[\]n"$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"type" line eol check' | ||
|
|
||
| ############################################################ | ||
| # 6. tag line label check #1 | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object 779e9b33986b1c2670fff52c5067603117b3e895 | ||
| type tag | ||
| xxx mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char57: no "tag " found$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"tag" line label check #1' | ||
|
|
||
| ############################################################ | ||
| # 7. tag line label check #2 | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object 779e9b33986b1c2670fff52c5067603117b3e895 | ||
| type taggggggggggggggggggggggggggggggg | ||
| tag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char87: no "tag " found$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"tag" line label check #2' | ||
|
|
||
| ############################################################ | ||
| # 8. type line type-name length check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object 779e9b33986b1c2670fff52c5067603117b3e895 | ||
| type taggggggggggggggggggggggggggggggg | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char53: type too long$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"type" line type-name length check' | ||
|
|
||
| ############################################################ | ||
| # 9. verify object (SHA1/type) check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object 779e9b33986b1c2670fff52c5067603117b3e895 | ||
| type tagggg | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char7: could not verify object.*$ | ||
| EOF | ||
|
|
||
| check_verify_failure 'verify object (SHA1/type) check' | ||
|
|
||
| ############################################################ | ||
| # 10. verify tag-name check | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object $head | ||
| type commit | ||
| tag my tag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char67: could not verify tag name$ | ||
| EOF | ||
|
|
||
| check_verify_failure 'verify tag-name check' | ||
|
|
||
| ############################################################ | ||
| # 11. tagger line lable check #1 | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object $head | ||
| type commit | ||
| tag mytag | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char70: could not find "tagger"$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"tagger" line label check #1' | ||
|
|
||
| ############################################################ | ||
| # 12. tagger line lable check #2 | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object $head | ||
| type commit | ||
| tag mytag | ||
| tagger | ||
| EOF | ||
|
|
||
| cat >expect.pat <<EOF | ||
| ^error: char70: could not find "tagger"$ | ||
| EOF | ||
|
|
||
| check_verify_failure '"tagger" line label check #2' | ||
|
|
||
| ############################################################ | ||
| # 13. create valid tag | ||
|
|
||
| cat >tag.sig <<EOF | ||
| object $head | ||
| type commit | ||
| tag mytag | ||
| tagger another@example.com | ||
| EOF | ||
|
|
||
| test_expect_success \ | ||
| 'create valid tag' \ | ||
| 'git-mktag <tag.sig >.git/refs/tags/mytag 2>message' | ||
|
|
||
| ############################################################ | ||
| # 14. check mytag | ||
|
|
||
| test_expect_success \ | ||
| 'check mytag' \ | ||
| 'git-tag -l | grep mytag' | ||
|
|
||
|
|
||
| test_done |