X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7004-tag.sh;h=0d07bc39c745ade65370dde35f43f16a37231179;hb=d8b3a2bf189a9e7fea76454157b77fa71c9abc05;hp=5d15449be59f23e75eaca4bdfc595f2eed8edf51;hpb=9a54463a8ab04f19a7f6127df7287320cc731a91;p=git.git

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 5d15449be..0d07bc39c 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -5,7 +5,7 @@
 
 test_description='git-tag
 
-Basic tests for operations with tags.'
+Tests for operations with tags.'
 
 . ./test-lib.sh
 
@@ -16,11 +16,15 @@ tag_exists () {
 }
 
 # todo: git tag -l now returns always zero, when fixed, change this test
-test_expect_success 'listing all tags in an empty tree should succeed' \
-	'git tag -l'
+test_expect_success 'listing all tags in an empty tree should succeed' '
+	git tag -l &&
+	git tag
+'
 
-test_expect_success 'listing all tags in an empty tree should output nothing' \
-	'test `git-tag -l | wc -l` -eq 0'
+test_expect_success 'listing all tags in an empty tree should output nothing' '
+	test `git-tag -l | wc -l` -eq 0 &&
+	test `git-tag | wc -l` -eq 0
+'
 
 test_expect_failure 'looking for a tag in an empty tree should fail' \
 	'tag_exists mytag'
@@ -49,11 +53,15 @@ test_expect_success 'creating a tag using default HEAD should succeed' '
 	git tag mytag
 '
 
-test_expect_success 'listing all tags if one exists should succeed' \
-	'git-tag -l'
+test_expect_success 'listing all tags if one exists should succeed' '
+	git-tag -l &&
+	git-tag
+'
 
-test_expect_success 'listing all tags if one exists should output that tag' \
-	'test `git-tag -l` = mytag'
+test_expect_success 'listing all tags if one exists should output that tag' '
+	test `git-tag -l` = mytag &&
+	test `git-tag` = mytag
+'
 
 # pattern matching:
 
@@ -164,7 +172,9 @@ test_expect_success 'listing all tags should print them ordered' '
 	git tag a1 &&
 	git tag v1.0 &&
 	git tag t210 &&
-	git tag -l > actual
+	git tag -l > actual &&
+	git diff expect actual &&
+	git tag > actual &&
 	git diff expect actual
 '
 
@@ -175,19 +185,18 @@ cba
 EOF
 test_expect_success \
 	'listing tags with substring as pattern must print those matching' '
-	git-tag -l a > actual &&
-	git-diff expect actual
+	git-tag -l "*a*" > actual &&
+	git diff expect actual
 '
 
 cat >expect <<EOF
 v0.2.1
 v1.0.1
-v1.1.3
 EOF
 test_expect_success \
-	'listing tags with substring as pattern must print those matching' '
-	git-tag -l .1 > actual &&
-	git-diff expect actual
+	'listing tags with a suffix as pattern must print those matching' '
+	git-tag -l "*.1" > actual &&
+	git diff expect actual
 '
 
 cat >expect <<EOF
@@ -195,45 +204,44 @@ t210
 t211
 EOF
 test_expect_success \
-	'listing tags with substring as pattern must print those matching' '
-	git-tag -l t21 > actual &&
-	git-diff expect actual
+	'listing tags with a prefix as pattern must print those matching' '
+	git-tag -l "t21*" > actual &&
+	git diff expect actual
 '
 
 cat >expect <<EOF
 a1
-aa1
 EOF
 test_expect_success \
-	'listing tags using a name as pattern must print those matching' '
+	'listing tags using a name as pattern must print that one matching' '
 	git-tag -l a1 > actual &&
-	git-diff expect actual
+	git diff expect actual
 '
 
 cat >expect <<EOF
 v1.0
-v1.0.1
 EOF
 test_expect_success \
-	'listing tags using a name as pattern must print those matching' '
+	'listing tags using a name as pattern must print that one matching' '
 	git-tag -l v1.0 > actual &&
-	git-diff expect actual
+	git diff expect actual
 '
 
 cat >expect <<EOF
+v1.0.1
 v1.1.3
 EOF
 test_expect_success \
 	'listing tags with ? in the pattern should print those matching' '
-	git-tag -l "1.1?" > actual &&
-	git-diff expect actual
+	git-tag -l "v1.?.?" > actual &&
+	git diff expect actual
 '
 
 >expect
 test_expect_success \
 	'listing tags using v.* should print nothing because none have v.' '
 	git-tag -l "v.*" > actual &&
-	git-diff expect actual
+	git diff expect actual
 '
 
 cat >expect <<EOF
@@ -245,7 +253,7 @@ EOF
 test_expect_success \
 	'listing tags using v* should print only those having v' '
 	git-tag -l "v*" > actual &&
-	git-diff expect actual
+	git diff expect actual
 '
 
 # creating and verifying lightweight tags:
@@ -253,8 +261,8 @@ test_expect_success \
 test_expect_success \
 	'a non-annotated tag created without parameters should point to HEAD' '
 	git-tag non-annotated-tag &&
-	test $(git-cat-file -t non-annotated-tag) = commit &&
-	test $(git-rev-parse non-annotated-tag) = $(git-rev-parse HEAD)
+	test $(git cat-file -t non-annotated-tag) = commit &&
+	test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
 '
 
 test_expect_failure 'trying to verify an unknown tag should fail' \
@@ -264,6 +272,10 @@ test_expect_failure \
 	'trying to verify a non-annotated and non-signed tag should fail' \
 	'git-tag -v non-annotated-tag'
 
+test_expect_failure \
+	'trying to verify many non-annotated or unknown tags, should fail' \
+	'git-tag -v unknown-tag1 non-annotated-tag unknown-tag2'
+
 # creating annotated tags:
 
 get_tag_msg () {
@@ -306,6 +318,45 @@ test_expect_success \
 	git diff expect actual
 '
 
+cat >inputmsg <<EOF
+A message from the
+standard input
+EOF
+get_tag_header stdin-annotated-tag $commit commit $time >expect
+cat inputmsg >>expect
+test_expect_success 'creating an annotated tag with -F - should succeed' '
+	git-tag -F - stdin-annotated-tag <inputmsg &&
+	get_tag_msg stdin-annotated-tag >actual &&
+	git diff expect actual
+'
+
+test_expect_success \
+	'trying to create a tag with a non-existing -F file should fail' '
+	! test -f nonexistingfile &&
+	! tag_exists notag &&
+	! git-tag -F nonexistingfile notag &&
+	! tag_exists notag
+'
+
+test_expect_success \
+	'trying to create tags giving many -m or -F options should fail' '
+	echo "message file 1" >msgfile1 &&
+	echo "message file 2" >msgfile2 &&
+	! tag_exists msgtag &&
+	! git-tag -m "message 1" -m "message 2" msgtag &&
+	! tag_exists msgtag &&
+	! git-tag -F msgfile1 -F msgfile2 msgtag &&
+	! tag_exists msgtag &&
+	! git-tag -m "message 1" -F msgfile1 msgtag &&
+	! tag_exists msgtag &&
+	! git-tag -F msgfile1 -m "message 1" msgtag &&
+	! tag_exists msgtag &&
+	! git-tag -F msgfile1 -m "message 1" -F msgfile2 msgtag &&
+	! tag_exists msgtag &&
+	! git-tag -m "message 1" -F msgfile1 -m "message 2" msgtag &&
+	! tag_exists msgtag
+'
+
 # blank and empty messages:
 
 get_tag_header empty-annotated-tag $commit commit $time >expect
@@ -437,6 +488,106 @@ test_expect_success \
 	git diff expect actual
 '
 
+# listing messages for annotated non-signed tags:
+
+test_expect_success \
+	'listing the one-line message of a non-signed tag should succeed' '
+	git-tag -m "A msg" tag-one-line &&
+
+	echo "tag-one-line" >expect &&
+	git-tag -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l tag-one-line >actual &&
+	git diff expect actual &&
+
+	echo "tag-one-line    A msg" >expect &&
+	git-tag -n xxx -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n "" -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^tag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l tag-one-line >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l tag-one-line >actual &&
+	git diff expect actual &&
+	git-tag -n 999 -l tag-one-line >actual &&
+	git diff expect actual
+'
+
+test_expect_success \
+	'listing the zero-lines message of a non-signed tag should succeed' '
+	git-tag -m "" tag-zero-lines &&
+
+	echo "tag-zero-lines" >expect &&
+	git-tag -l | grep "^tag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^tag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l tag-zero-lines >actual &&
+	git diff expect actual &&
+
+	echo "tag-zero-lines  " >expect &&
+	git-tag -n 1 -l | grep "^tag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^tag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l tag-zero-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l tag-zero-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 999 -l tag-zero-lines >actual &&
+	git diff expect actual
+'
+
+echo 'tag line one' >annotagmsg
+echo 'tag line two' >>annotagmsg
+echo 'tag line three' >>annotagmsg
+test_expect_success \
+	'listing many message lines of a non-signed tag should succeed' '
+	git-tag -F annotagmsg tag-lines &&
+
+	echo "tag-lines" >expect &&
+	git-tag -l | grep "^tag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^tag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l tag-lines >actual &&
+	git diff expect actual &&
+
+	echo "tag-lines       tag line one" >expect &&
+	git-tag -n 1 -l | grep "^tag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^tag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l tag-lines >actual &&
+	git diff expect actual &&
+
+	echo "    tag line two" >>expect &&
+	git-tag -n 2 -l | grep "^ *tag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l tag-lines >actual &&
+	git diff expect actual &&
+
+	echo "    tag line three" >>expect &&
+	git-tag -n 3 -l | grep "^ *tag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 3 -l tag-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 4 -l | grep "^ *tag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 4 -l tag-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 99 -l | grep "^ *tag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 99 -l tag-lines >actual &&
+	git diff expect actual
+'
+
 # trying to verify annotated non-signed tags:
 
 test_expect_success \
@@ -451,6 +602,12 @@ test_expect_success \
 	! git-tag -v file-annotated-tag
 '
 
+test_expect_success \
+	'trying to verify two annotated non-signed tags should fail' '
+	tag_exists annotated-tag file-annotated-tag &&
+	! git-tag -v annotated-tag file-annotated-tag
+'
+
 # creating and verifying signed tags:
 
 gpg --version >/dev/null
@@ -460,6 +617,17 @@ if [ $? -eq 127 ]; then
 	exit
 fi
 
+# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
+# the gpg version 1.0.6 didn't parse trust packets correctly, so for
+# that version, creation of signed tags using the generated key fails.
+case "$(gpg --version)" in
+'gpg (GnuPG) 1.0.6'*)
+	echo "Skipping signed tag tests, because a bug in 1.0.6 version"
+	test_done
+	exit
+	;;
+esac
+
 # key generation info: gpg --homedir t/t7004 --gen-key
 # Type DSA and Elgamal, size 2048 bits, no expiration date.
 # Name and email: C O Mitter <committer@example.com>
@@ -475,12 +643,58 @@ echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success 'creating a signed tag with -m message should succeed' '
 	git-tag -s -m "A signed tag message" signed-tag &&
 	get_tag_msg signed-tag >actual &&
-	git-diff expect actual
+	git diff expect actual
+'
+
+cat >sigmsgfile <<EOF
+Another signed tag
+message in a file.
+EOF
+get_tag_header file-signed-tag $commit commit $time >expect
+cat sigmsgfile >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success \
+	'creating a signed tag with -F messagefile should succeed' '
+	git-tag -s -F sigmsgfile file-signed-tag &&
+	get_tag_msg file-signed-tag >actual &&
+	git diff expect actual
+'
+
+cat >siginputmsg <<EOF
+A signed tag message from
+the standard input
+EOF
+get_tag_header stdin-signed-tag $commit commit $time >expect
+cat siginputmsg >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success 'creating a signed tag with -F - should succeed' '
+	git-tag -s -F - stdin-signed-tag <siginputmsg &&
+	get_tag_msg stdin-signed-tag >actual &&
+	git diff expect actual
+'
+
+test_expect_success \
+	'trying to create a signed tag with non-existing -F file should fail' '
+	! test -f nonexistingfile &&
+	! tag_exists nosigtag &&
+	! git-tag -s -F nonexistingfile nosigtag &&
+	! tag_exists nosigtag
 '
 
 test_expect_success 'verifying a signed tag should succeed' \
 	'git-tag -v signed-tag'
 
+test_expect_success 'verifying two signed tags in one command should succeed' \
+	'git-tag -v signed-tag file-signed-tag'
+
+test_expect_success \
+	'verifying many signed and non-signed tags should fail' '
+	! git-tag -v signed-tag annotated-tag &&
+	! git-tag -v file-annotated-tag file-signed-tag &&
+	! git-tag -v annotated-tag file-signed-tag file-annotated-tag &&
+	! git-tag -v signed-tag annotated-tag file-signed-tag
+'
+
 test_expect_success 'verifying a forged tag should fail' '
 	forged=$(git cat-file tag signed-tag |
 		sed -e "s/signed-tag/forged-tag/" |
@@ -640,6 +854,106 @@ test_expect_success \
 	git-tag -v commentnonlfile-signed-tag
 '
 
+# listing messages for signed tags:
+
+test_expect_success \
+	'listing the one-line message of a signed tag should succeed' '
+	git-tag -s -m "A message line signed" stag-one-line &&
+
+	echo "stag-one-line" >expect &&
+	git-tag -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l stag-one-line >actual &&
+	git diff expect actual &&
+
+	echo "stag-one-line   A message line signed" >expect &&
+	git-tag -n xxx -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n "" -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^stag-one-line" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l stag-one-line >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l stag-one-line >actual &&
+	git diff expect actual &&
+	git-tag -n 999 -l stag-one-line >actual &&
+	git diff expect actual
+'
+
+test_expect_success \
+	'listing the zero-lines message of a signed tag should succeed' '
+	git-tag -s -m "" stag-zero-lines &&
+
+	echo "stag-zero-lines" >expect &&
+	git-tag -l | grep "^stag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^stag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l stag-zero-lines >actual &&
+	git diff expect actual &&
+
+	echo "stag-zero-lines " >expect &&
+	git-tag -n 1 -l | grep "^stag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^stag-zero-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l stag-zero-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l stag-zero-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 999 -l stag-zero-lines >actual &&
+	git diff expect actual
+'
+
+echo 'stag line one' >sigtagmsg
+echo 'stag line two' >>sigtagmsg
+echo 'stag line three' >>sigtagmsg
+test_expect_success \
+	'listing many message lines of a signed tag should succeed' '
+	git-tag -s -F sigtagmsg stag-lines &&
+
+	echo "stag-lines" >expect &&
+	git-tag -l | grep "^stag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l | grep "^stag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 0 -l stag-lines >actual &&
+	git diff expect actual &&
+
+	echo "stag-lines      stag line one" >expect &&
+	git-tag -n 1 -l | grep "^stag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n -l | grep "^stag-lines" >actual &&
+	git diff expect actual &&
+	git-tag -n 1 -l stag-lines >actual &&
+	git diff expect actual &&
+
+	echo "    stag line two" >>expect &&
+	git-tag -n 2 -l | grep "^ *stag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 2 -l stag-lines >actual &&
+	git diff expect actual &&
+
+	echo "    stag line three" >>expect &&
+	git-tag -n 3 -l | grep "^ *stag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 3 -l stag-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 4 -l | grep "^ *stag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 4 -l stag-lines >actual &&
+	git diff expect actual &&
+	git-tag -n 99 -l | grep "^ *stag.line" >actual &&
+	git diff expect actual &&
+	git-tag -n 99 -l stag-lines >actual &&
+	git diff expect actual
+'
+
 # tags pointing to objects different from commits:
 
 tree=$(git rev-parse HEAD^{tree})
@@ -676,6 +990,13 @@ test_expect_success \
 	git diff expect actual
 '
 
+# try to sign with bad user.signingkey
+git config user.signingkey BobTheMouse
+test_expect_failure \
+	'git-tag -s fails if gpg is misconfigured' \
+	'git tag -s -m tail tag-gpg-failure'
+git config --unset user.signingkey
+
 # try to verify without gpg:
 
 rm -rf gpghome