parse-options: catch likely typo in presense of aggregated options.

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 5f7e388d7add06b8392997037a86c4d0f8524ceb..df496a95ff16b1a42cfa140cc3d1c4449e4023ab 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -339,20 +339,14 @@ test_expect_success \
 '
 
 test_expect_success \
-       'trying to create tags giving many -m or -F options should fail' '
+       'trying to create tags giving both -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
 '
@@ -497,25 +491,21 @@ test_expect_success \
        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-tag -n0 -l | grep "^tag-one-line" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l tag-one-line >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l tag-one-line >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l tag-one-line >actual &&
+       git-tag -n2 -l tag-one-line >actual &&
        git diff expect actual &&
-       git-tag -n 999 -l tag-one-line >actual &&
+       git-tag -n999 -l tag-one-line >actual &&
        git diff expect actual
 '
 
@@ -526,21 +516,21 @@ test_expect_success \
        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-tag -n0 -l | grep "^tag-zero-lines" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l tag-zero-lines >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l tag-zero-lines >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l tag-zero-lines >actual &&
+       git-tag -n2 -l tag-zero-lines >actual &&
        git diff expect actual &&
-       git-tag -n 999 -l tag-zero-lines >actual &&
+       git-tag -n999 -l tag-zero-lines >actual &&
        git diff expect actual
 '
 
@@ -554,37 +544,37 @@ test_expect_success \
        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-tag -n0 -l | grep "^tag-lines" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l tag-lines >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l tag-lines >actual &&
        git diff expect actual &&
 
        echo "    tag line two" >>expect &&
-       git-tag -n 2 -l | grep "^ *tag.line" >actual &&
+       git-tag -n2 -l | grep "^ *tag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l tag-lines >actual &&
+       git-tag -n2 -l tag-lines >actual &&
        git diff expect actual &&
 
        echo "    tag line three" >>expect &&
-       git-tag -n 3 -l | grep "^ *tag.line" >actual &&
+       git-tag -n3 -l | grep "^ *tag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 3 -l tag-lines >actual &&
+       git-tag -n3 -l tag-lines >actual &&
        git diff expect actual &&
-       git-tag -n 4 -l | grep "^ *tag.line" >actual &&
+       git-tag -n4 -l | grep "^ *tag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 4 -l tag-lines >actual &&
+       git-tag -n4 -l tag-lines >actual &&
        git diff expect actual &&
-       git-tag -n 99 -l | grep "^ *tag.line" >actual &&
+       git-tag -n99 -l | grep "^ *tag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 99 -l tag-lines >actual &&
+       git-tag -n99 -l tag-lines >actual &&
        git diff expect actual
 '
 
@@ -646,6 +636,46 @@ test_expect_success 'creating a signed tag with -m message should succeed' '
        git diff expect actual
 '
 
+get_tag_header u-signed-tag $commit commit $time >expect
+echo 'Another message' >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success 'sign with a given key id' '
+
+       git tag -u committer@example.com -m "Another message" u-signed-tag &&
+       get_tag_msg u-signed-tag >actual &&
+       git diff expect actual
+
+'
+
+test_expect_success 'sign with an unknown id (1)' '
+
+       ! git tag -u author@example.com -m "Another message" o-signed-tag
+
+'
+
+test_expect_success 'sign with an unknown id (2)' '
+
+       ! git tag -u DEADBEEF -m "Another message" o-signed-tag
+
+'
+
+cat >fakeeditor <<'EOF'
+#!/bin/sh
+test -n "$1" && exec >"$1"
+echo A signed tag message
+echo from a fake editor.
+EOF
+chmod +x fakeeditor
+
+get_tag_header implied-sign $commit commit $time >expect
+./fakeeditor >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success '-u implies signed tag' '
+       GIT_EDITOR=./fakeeditor git-tag -u CDDE430D implied-sign &&
+       get_tag_msg implied-sign >actual &&
+       git diff expect actual
+'
+
 cat >sigmsgfile <<EOF
 Another signed tag
 message in a file.
@@ -673,6 +703,15 @@ test_expect_success 'creating a signed tag with -F - should succeed' '
        git diff expect actual
 '
 
+get_tag_header implied-annotate $commit commit $time >expect
+./fakeeditor >>expect
+echo '-----BEGIN PGP SIGNATURE-----' >>expect
+test_expect_success '-s implies annotated tag' '
+       GIT_EDITOR=./fakeeditor git-tag -s implied-annotate &&
+       get_tag_msg implied-annotate >actual &&
+       git diff expect actual
+'
+
 test_expect_success \
        'trying to create a signed tag with non-existing -F file should fail' '
        ! test -f nonexistingfile &&
@@ -863,25 +902,21 @@ test_expect_success \
        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-tag -n0 -l | grep "^stag-one-line" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l stag-one-line >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l stag-one-line >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l stag-one-line >actual &&
+       git-tag -n2 -l stag-one-line >actual &&
        git diff expect actual &&
-       git-tag -n 999 -l stag-one-line >actual &&
+       git-tag -n999 -l stag-one-line >actual &&
        git diff expect actual
 '
 
@@ -892,21 +927,21 @@ test_expect_success \
        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-tag -n0 -l | grep "^stag-zero-lines" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l stag-zero-lines >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l stag-zero-lines >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l stag-zero-lines >actual &&
+       git-tag -n2 -l stag-zero-lines >actual &&
        git diff expect actual &&
-       git-tag -n 999 -l stag-zero-lines >actual &&
+       git-tag -n999 -l stag-zero-lines >actual &&
        git diff expect actual
 '
 
@@ -920,37 +955,37 @@ test_expect_success \
        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-tag -n0 -l | grep "^stag-lines" >actual &&
        git diff expect actual &&
-       git-tag -n 0 -l stag-lines >actual &&
+       git-tag -n0 -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-tag -n1 -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-tag -n1 -l stag-lines >actual &&
        git diff expect actual &&
 
        echo "    stag line two" >>expect &&
-       git-tag -n 2 -l | grep "^ *stag.line" >actual &&
+       git-tag -n2 -l | grep "^ *stag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 2 -l stag-lines >actual &&
+       git-tag -n2 -l stag-lines >actual &&
        git diff expect actual &&
 
        echo "    stag line three" >>expect &&
-       git-tag -n 3 -l | grep "^ *stag.line" >actual &&
+       git-tag -n3 -l | grep "^ *stag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 3 -l stag-lines >actual &&
+       git-tag -n3 -l stag-lines >actual &&
        git diff expect actual &&
-       git-tag -n 4 -l | grep "^ *stag.line" >actual &&
+       git-tag -n4 -l | grep "^ *stag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 4 -l stag-lines >actual &&
+       git-tag -n4 -l stag-lines >actual &&
        git diff expect actual &&
-       git-tag -n 99 -l | grep "^ *stag.line" >actual &&
+       git-tag -n99 -l | grep "^ *stag.line" >actual &&
        git diff expect actual &&
-       git-tag -n 99 -l stag-lines >actual &&
+       git-tag -n99 -l stag-lines >actual &&
        git diff expect actual
 '