More permissive "git-rm --cached" behavior without -f.

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 5d15449be59f23e75eaca4bdfc595f2eed8edf51..17de2a90e68665d428fa772acc6e9e72b333ce80 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -164,7 +164,7 @@ 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
 '
 
@@ -176,7 +176,7 @@ EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
        git-tag -l a > actual &&
-       git-diff expect actual
+       git diff expect actual
 '
 
 cat >expect <<EOF
@@ -187,7 +187,7 @@ EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
        git-tag -l .1 > actual &&
-       git-diff expect actual
+       git diff expect actual
 '
 
 cat >expect <<EOF
@@ -197,7 +197,7 @@ EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
        git-tag -l t21 > actual &&
-       git-diff expect actual
+       git diff expect actual
 '
 
 cat >expect <<EOF
@@ -207,7 +207,7 @@ EOF
 test_expect_success \
        'listing tags using a name as pattern must print those matching' '
        git-tag -l a1 > actual &&
-       git-diff expect actual
+       git diff expect actual
 '
 
 cat >expect <<EOF
@@ -217,7 +217,7 @@ EOF
 test_expect_success \
        'listing tags using a name as pattern must print those matching' '
        git-tag -l v1.0 > actual &&
-       git-diff expect actual
+       git diff expect actual
 '
 
 cat >expect <<EOF
@@ -226,14 +226,14 @@ 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 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 +245,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 +253,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' \
@@ -437,6 +437,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 \
@@ -460,6 +560,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,7 +586,7 @@ 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
 '
 
 test_expect_success 'verifying a signed tag should succeed' \
@@ -640,6 +751,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})