tests: use "git xyzzy" form (t7000 - t7199)

Converts tests between t7001-t7103.

Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 910a28c7e29b6dd8bd30d1ccb156681b44e51bca..66bb1264ff7f8528168ca82ba908cff29658fa9d 100755 (executable)
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -8,7 +8,7 @@ test_expect_success \
     'mkdir path0 path1 &&
      cp ../../COPYING path0/COPYING &&
      git add path0/COPYING &&
     'mkdir path0 path1 &&
      cp ../../COPYING path0/COPYING &&
      git add path0/COPYING &&

-     git-commit -m add -a'
+     git commit -m add -a'

 
 test_expect_success \
     'moving the file out of subdirectory' \
 
 test_expect_success \
     'moving the file out of subdirectory' \


@@ -17,7 +17,7 @@ test_expect_success \
 # in path0 currently
 test_expect_success \
     'commiting the change' \
 # in path0 currently
 test_expect_success \
     'commiting the change' \

-    'cd .. && git-commit -m move-out -a'
+    'cd .. && git commit -m move-out -a'

 
 test_expect_success \
     'checking the commit' \
 
 test_expect_success \
     'checking the commit' \


@@ -31,7 +31,7 @@ test_expect_success \
 # in path0 currently
 test_expect_success \
     'commiting the change' \
 # in path0 currently
 test_expect_success \
     'commiting the change' \

-    'cd .. && git-commit -m move-in -a'
+    'cd .. && git commit -m move-in -a'

 
 test_expect_success \
     'checking the commit' \
 
 test_expect_success \
     'checking the commit' \


@@ -42,7 +42,7 @@ test_expect_success \
     'adding another file' \
     'cp ../../README path0/README &&
      git add path0/README &&
     'adding another file' \
     'cp ../../README path0/README &&
      git add path0/README &&

-     git-commit -m add2 -a'
+     git commit -m add2 -a'

 
 test_expect_success \
     'moving whole subdirectory' \
 
 test_expect_success \
     'moving whole subdirectory' \


@@ -50,7 +50,7 @@ test_expect_success \
 
 test_expect_success \
     'commiting the change' \
 
 test_expect_success \
     'commiting the change' \

-    'git-commit -m dir-move -a'
+    'git commit -m dir-move -a'

 
 test_expect_success \
     'checking the commit' \
 
 test_expect_success \
     'checking the commit' \


@@ -69,7 +69,7 @@ test_expect_success \
 
 test_expect_success \
     'commiting the change' \
 
 test_expect_success \
     'commiting the change' \

-    'git-commit -m dir-move -a'
+    'git commit -m dir-move -a'

 
 test_expect_success \
     'checking the commit' \
 
 test_expect_success \
     'checking the commit' \

diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index a0ab096c8fdee153a89a1428f85c9bf107badada..182aea4267c33fd0f737c9028cedcb635e3348e2 100755 (executable)
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-filter-branch'
+test_description='git filter-branch'

 . ./test-lib.sh
 
 make_commit () {
 . ./test-lib.sh
 
 make_commit () {


@@ -32,14 +32,14 @@ test_expect_success 'setup' '
 H=$(git rev-parse H)
 
 test_expect_success 'rewrite identically' '
 H=$(git rev-parse H)
 
 test_expect_success 'rewrite identically' '

-       git-filter-branch branch
+       git filter-branch branch

 '
 test_expect_success 'result is really identical' '
        test $H = $(git rev-parse HEAD)
 '
 
 test_expect_success 'rewrite bare repository identically' '
 '
 test_expect_success 'result is really identical' '
        test $H = $(git rev-parse HEAD)
 '
 
 test_expect_success 'rewrite bare repository identically' '

-       (git config core.bare true && cd .git && git-filter-branch branch)
+       (git config core.bare true && cd .git && git filter-branch branch)

 '
 git config core.bare false
 test_expect_success 'result is really identical' '
 '
 git config core.bare false
 test_expect_success 'result is really identical' '


@@ -47,7 +47,7 @@ test_expect_success 'result is really identical' '
 '
 
 test_expect_success 'rewrite, renaming a specific file' '
 '
 
 test_expect_success 'rewrite, renaming a specific file' '

-       git-filter-branch -f --tree-filter "mv d doh || :" HEAD
+       git filter-branch -f --tree-filter "mv d doh || :" HEAD

 '
 
 test_expect_success 'test that the file was renamed' '
 '
 
 test_expect_success 'test that the file was renamed' '


@@ -58,7 +58,7 @@ test_expect_success 'test that the file was renamed' '
 '
 
 test_expect_success 'rewrite, renaming a specific directory' '
 '
 
 test_expect_success 'rewrite, renaming a specific directory' '

-       git-filter-branch -f --tree-filter "mv dir diroh || :" HEAD
+       git filter-branch -f --tree-filter "mv dir diroh || :" HEAD

 '
 
 test_expect_success 'test that the directory was renamed' '
 '
 
 test_expect_success 'test that the directory was renamed' '


@@ -73,7 +73,7 @@ test_expect_success 'test that the directory was renamed' '
 git tag oldD HEAD~4
 test_expect_success 'rewrite one branch, keeping a side branch' '
        git branch modD oldD &&
 git tag oldD HEAD~4
 test_expect_success 'rewrite one branch, keeping a side branch' '
        git branch modD oldD &&

-       git-filter-branch -f --tree-filter "mv b boh || :" D..modD
+       git filter-branch -f --tree-filter "mv b boh || :" D..modD

 '
 
 test_expect_success 'common ancestor is still common (unchanged)' '
 '
 
 test_expect_success 'common ancestor is still common (unchanged)' '


@@ -96,7 +96,7 @@ test_expect_success 'filter subdirectory only' '
        test_tick &&
        git commit -m "again not subdir" &&
        git branch sub &&
        test_tick &&
        git commit -m "again not subdir" &&
        git branch sub &&

-       git-filter-branch -f --subdirectory-filter subdir refs/heads/sub
+       git filter-branch -f --subdirectory-filter subdir refs/heads/sub

 '
 
 test_expect_success 'subdirectory filter result looks okay' '
 '
 
 test_expect_success 'subdirectory filter result looks okay' '


@@ -120,7 +120,7 @@ test_expect_success 'more setup' '
 
 test_expect_success 'use index-filter to move into a subdirectory' '
        git branch directorymoved &&
 
 test_expect_success 'use index-filter to move into a subdirectory' '
        git branch directorymoved &&

-       git-filter-branch -f --index-filter \
+       git filter-branch -f --index-filter \

                 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
                        git update-index --index-info &&
                 "git ls-files -s | sed \"s-\\t-&newsubdir/-\" |
                  GIT_INDEX_FILE=\$GIT_INDEX_FILE.new \
                        git update-index --index-info &&


@@ -129,7 +129,7 @@ test_expect_success 'use index-filter to move into a subdirectory' '
 
 test_expect_success 'stops when msg filter fails' '
        old=$(git rev-parse HEAD) &&
 
 test_expect_success 'stops when msg filter fails' '
        old=$(git rev-parse HEAD) &&

-       test_must_fail git-filter-branch -f --msg-filter false HEAD &&
+       test_must_fail git filter-branch -f --msg-filter false HEAD &&

        test $old = $(git rev-parse HEAD) &&
        rm -rf .git-rewrite
 '
        test $old = $(git rev-parse HEAD) &&
        rm -rf .git-rewrite
 '


@@ -140,7 +140,7 @@ test_expect_success 'author information is preserved' '
        test_tick &&
        GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
        git branch preserved-author &&
        test_tick &&
        GIT_AUTHOR_NAME="B V Uips" git commit -m bvuips &&
        git branch preserved-author &&

-       git-filter-branch -f --msg-filter "cat; \
+       git filter-branch -f --msg-filter "cat; \

                        test \$GIT_COMMIT != $(git rev-parse master) || \
                        echo Hallo" \
                preserved-author &&
                        test \$GIT_COMMIT != $(git rev-parse master) || \
                        echo Hallo" \
                preserved-author &&


@@ -152,7 +152,7 @@ test_expect_success "remove a certain author's commits" '
        test_tick &&
        git commit -m i i &&
        git branch removed-author &&
        test_tick &&
        git commit -m i i &&
        git branch removed-author &&

-       git-filter-branch -f --commit-filter "\
+       git filter-branch -f --commit-filter "\

                if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
                then\
                        skip_commit \"\$@\";
                if [ \"\$GIT_AUTHOR_NAME\" = \"B V Uips\" ];\
                then\
                        skip_commit \"\$@\";

diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 8d44c2ed1f5148cbfc7affe155eaa4b6bd04c66a..33cde705953acc9a30d8535da77fe0f90e2b3118 100755 (executable)
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Carlos Rica
 #
 
 # Copyright (c) 2007 Carlos Rica
 #
 

-test_description='git-tag
+test_description='git tag

 
 Tests for operations with tags.'
 
 
 Tests for operations with tags.'
 


@@ -22,25 +22,25 @@ test_expect_success 'listing all tags in an empty tree should succeed' '
 '
 
 test_expect_success 'listing all tags in an empty tree should output nothing' '
 '
 
 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 `git tag -l | wc -l` -eq 0 &&
+       test `git tag | wc -l` -eq 0

 '
 
 test_expect_success 'looking for a tag in an empty tree should fail' \
        '! (tag_exists mytag)'
 
 test_expect_success 'creating a tag in an empty tree should fail' '
 '
 
 test_expect_success 'looking for a tag in an empty tree should fail' \
        '! (tag_exists mytag)'
 
 test_expect_success 'creating a tag in an empty tree should fail' '

-       test_must_fail git-tag mynotag &&
+       test_must_fail git tag mynotag &&

        ! tag_exists mynotag
 '
 
 test_expect_success 'creating a tag for HEAD in an empty tree should fail' '
        ! tag_exists mynotag
 '
 
 test_expect_success 'creating a tag for HEAD in an empty tree should fail' '

-       test_must_fail git-tag mytaghead HEAD &&
+       test_must_fail git tag mytaghead HEAD &&

        ! tag_exists mytaghead
 '
 
 test_expect_success 'creating a tag for an unknown revision should fail' '
        ! tag_exists mytaghead
 '
 
 test_expect_success 'creating a tag for an unknown revision should fail' '

-       test_must_fail git-tag mytagnorev aaaaaaaaaaa &&
+       test_must_fail git tag mytagnorev aaaaaaaaaaa &&

        ! tag_exists mytagnorev
 '
 
        ! tag_exists mytagnorev
 '
 


@@ -54,32 +54,32 @@ test_expect_success 'creating a tag using default HEAD should succeed' '
 '
 
 test_expect_success 'listing all tags if one exists should succeed' '
 '
 
 test_expect_success 'listing all tags if one exists should succeed' '

-       git-tag -l &&
-       git-tag
+       git tag -l &&
+       git tag

 '
 
 test_expect_success 'listing all tags if one exists should output that tag' '
 '
 
 test_expect_success 'listing all tags if one exists should output that tag' '

-       test `git-tag -l` = mytag &&
-       test `git-tag` = mytag
+       test `git tag -l` = mytag &&
+       test `git tag` = mytag

 '
 
 # pattern matching:
 
 test_expect_success 'listing a tag using a matching pattern should succeed' \
 '
 
 # pattern matching:
 
 test_expect_success 'listing a tag using a matching pattern should succeed' \

-       'git-tag -l mytag'
+       'git tag -l mytag'

 
 test_expect_success \
        'listing a tag using a matching pattern should output that tag' \
 
 test_expect_success \
        'listing a tag using a matching pattern should output that tag' \

-       'test `git-tag -l mytag` = mytag'
+       'test `git tag -l mytag` = mytag'

 
 # todo: git tag -l now returns always zero, when fixed, change this test
 test_expect_success \
        'listing tags using a non-matching pattern should suceed' \
 
 # todo: git tag -l now returns always zero, when fixed, change this test
 test_expect_success \
        'listing tags using a non-matching pattern should suceed' \

-       'git-tag -l xxx'
+       'git tag -l xxx'

 
 test_expect_success \
        'listing tags using a non-matching pattern should output nothing' \
 
 test_expect_success \
        'listing tags using a non-matching pattern should output nothing' \

-       'test `git-tag -l xxx | wc -l` -eq 0'
+       'test `git tag -l xxx | wc -l` -eq 0'

 
 # special cases for creating tags:
 
 
 # special cases for creating tags:
 


@@ -89,13 +89,13 @@ test_expect_success \
 
 test_expect_success \
        'trying to create a tag with a non-valid name should fail' '
 
 test_expect_success \
        'trying to create a tag with a non-valid name should fail' '

-       test `git-tag -l | wc -l` -eq 1 &&
+       test `git tag -l | wc -l` -eq 1 &&

        test_must_fail git tag "" &&
        test_must_fail git tag .othertag &&
        test_must_fail git tag "other tag" &&
        test_must_fail git tag "othertag^" &&
        test_must_fail git tag "other~tag" &&
        test_must_fail git tag "" &&
        test_must_fail git tag .othertag &&
        test_must_fail git tag "other tag" &&
        test_must_fail git tag "othertag^" &&
        test_must_fail git tag "other~tag" &&

-       test `git-tag -l | wc -l` -eq 1
+       test `git tag -l | wc -l` -eq 1

 '
 
 test_expect_success 'creating a tag using HEAD directly should succeed' '
 '
 
 test_expect_success 'creating a tag using HEAD directly should succeed' '


@@ -107,7 +107,7 @@ test_expect_success 'creating a tag using HEAD directly should succeed' '
 
 test_expect_success 'trying to delete an unknown tag should fail' '
        ! tag_exists unknown-tag &&
 
 test_expect_success 'trying to delete an unknown tag should fail' '
        ! tag_exists unknown-tag &&

-       test_must_fail git-tag -d unknown-tag
+       test_must_fail git tag -d unknown-tag

 '
 
 cat >expect <<EOF
 '
 
 cat >expect <<EOF


@@ -117,7 +117,7 @@ EOF
 test_expect_success \
        'trying to delete tags without params should succeed and do nothing' '
        git tag -l > actual && test_cmp expect actual &&
 test_expect_success \
        'trying to delete tags without params should succeed and do nothing' '
        git tag -l > actual && test_cmp expect actual &&

-       git-tag -d &&
+       git tag -d &&

        git tag -l > actual && test_cmp expect actual
 '
 
        git tag -l > actual && test_cmp expect actual
 '
 


@@ -125,7 +125,7 @@ test_expect_success \
        'deleting two existing tags in one command should succeed' '
        tag_exists mytag &&
        tag_exists myhead &&
        'deleting two existing tags in one command should succeed' '
        tag_exists mytag &&
        tag_exists myhead &&

-       git-tag -d mytag myhead &&
+       git tag -d mytag myhead &&

        ! tag_exists mytag &&
        ! tag_exists myhead
 '
        ! tag_exists mytag &&
        ! tag_exists myhead
 '


@@ -133,7 +133,7 @@ test_expect_success \
 test_expect_success \
        'creating a tag with the name of another deleted one should succeed' '
        ! tag_exists mytag &&
 test_expect_success \
        'creating a tag with the name of another deleted one should succeed' '
        ! tag_exists mytag &&

-       git-tag mytag &&
+       git tag mytag &&

        tag_exists mytag
 '
 
        tag_exists mytag
 '
 


@@ -141,13 +141,13 @@ test_expect_success \
        'trying to delete two tags, existing and not, should fail in the 2nd' '
        tag_exists mytag &&
        ! tag_exists myhead &&
        'trying to delete two tags, existing and not, should fail in the 2nd' '
        tag_exists mytag &&
        ! tag_exists myhead &&

-       test_must_fail git-tag -d mytag anothertag &&
+       test_must_fail git tag -d mytag anothertag &&

        ! tag_exists mytag &&
        ! tag_exists myhead
 '
 
 test_expect_success 'trying to delete an already deleted tag should fail' \
        ! tag_exists mytag &&
        ! tag_exists myhead
 '
 
 test_expect_success 'trying to delete an already deleted tag should fail' \

-       'test_must_fail git-tag -d mytag'
+       'test_must_fail git tag -d mytag'

 
 # listing various tags with pattern matching:
 
 
 # listing various tags with pattern matching:
 


@@ -185,7 +185,7 @@ cba
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '
 EOF
 test_expect_success \
        'listing tags with substring as pattern must print those matching' '

-       git-tag -l "*a*" > actual &&
+       git tag -l "*a*" > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -195,7 +195,7 @@ v1.0.1
 EOF
 test_expect_success \
        'listing tags with a suffix as pattern must print those matching' '
 EOF
 test_expect_success \
        'listing tags with a suffix as pattern must print those matching' '

-       git-tag -l "*.1" > actual &&
+       git tag -l "*.1" > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -205,7 +205,7 @@ t211
 EOF
 test_expect_success \
        'listing tags with a prefix as pattern must print those matching' '
 EOF
 test_expect_success \
        'listing tags with a prefix as pattern must print those matching' '

-       git-tag -l "t21*" > actual &&
+       git tag -l "t21*" > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -214,7 +214,7 @@ a1
 EOF
 test_expect_success \
        'listing tags using a name as pattern must print that one matching' '
 EOF
 test_expect_success \
        'listing tags using a name as pattern must print that one matching' '

-       git-tag -l a1 > actual &&
+       git tag -l a1 > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -223,7 +223,7 @@ v1.0
 EOF
 test_expect_success \
        'listing tags using a name as pattern must print that one matching' '
 EOF
 test_expect_success \
        'listing tags using a name as pattern must print that one matching' '

-       git-tag -l v1.0 > actual &&
+       git tag -l v1.0 > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -233,14 +233,14 @@ v1.1.3
 EOF
 test_expect_success \
        'listing tags with ? in the pattern should print those matching' '
 EOF
 test_expect_success \
        'listing tags with ? in the pattern should print those matching' '

-       git-tag -l "v1.?.?" > actual &&
+       git tag -l "v1.?.?" > actual &&

        test_cmp expect actual
 '
 
 >expect
 test_expect_success \
        'listing tags using v.* should print nothing because none have v.' '
        test_cmp expect actual
 '
 
 >expect
 test_expect_success \
        'listing tags using v.* should print nothing because none have v.' '

-       git-tag -l "v.*" > actual &&
+       git tag -l "v.*" > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -252,7 +252,7 @@ v1.1.3
 EOF
 test_expect_success \
        'listing tags using v* should print only those having v' '
 EOF
 test_expect_success \
        'listing tags using v* should print only those having v' '

-       git-tag -l "v*" > actual &&
+       git tag -l "v*" > actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -260,21 +260,21 @@ test_expect_success \
 
 test_expect_success \
        'a non-annotated tag created without parameters should point to HEAD' '
 
 test_expect_success \
        'a non-annotated tag created without parameters should point to HEAD' '

-       git-tag non-annotated-tag &&
+       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_expect_success 'trying to verify an unknown tag should fail' \
        test $(git cat-file -t non-annotated-tag) = commit &&
        test $(git rev-parse non-annotated-tag) = $(git rev-parse HEAD)
 '
 
 test_expect_success 'trying to verify an unknown tag should fail' \

-       'test_must_fail git-tag -v unknown-tag'
+       'test_must_fail git tag -v unknown-tag'

 
 test_expect_success \
        'trying to verify a non-annotated and non-signed tag should fail' \
 
 test_expect_success \
        'trying to verify a non-annotated and non-signed tag should fail' \

-       'test_must_fail git-tag -v non-annotated-tag'
+       'test_must_fail git tag -v non-annotated-tag'

 
 test_expect_success \
        'trying to verify many non-annotated or unknown tags, should fail' \
 
 test_expect_success \
        'trying to verify many non-annotated or unknown tags, should fail' \

-       'test_must_fail git-tag -v unknown-tag1 non-annotated-tag unknown-tag2'
+       'test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2'

 
 # creating annotated tags:
 
 
 # creating annotated tags:
 


@@ -300,7 +300,7 @@ get_tag_header annotated-tag $commit commit $time >expect
 echo "A message" >>expect
 test_expect_success \
        'creating an annotated tag with -m message should succeed' '
 echo "A message" >>expect
 test_expect_success \
        'creating an annotated tag with -m message should succeed' '

-       git-tag -m "A message" annotated-tag &&
+       git tag -m "A message" annotated-tag &&

        get_tag_msg annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -313,7 +313,7 @@ get_tag_header file-annotated-tag $commit commit $time >expect
 cat msgfile >>expect
 test_expect_success \
        'creating an annotated tag with -F messagefile should succeed' '
 cat msgfile >>expect
 test_expect_success \
        'creating an annotated tag with -F messagefile should succeed' '

-       git-tag -F msgfile file-annotated-tag &&
+       git tag -F msgfile file-annotated-tag &&

        get_tag_msg file-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg file-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -325,7 +325,7 @@ 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' '
 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 &&
+       git tag -F - stdin-annotated-tag <inputmsg &&

        get_tag_msg stdin-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg stdin-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -334,7 +334,7 @@ test_expect_success \
        'trying to create a tag with a non-existing -F file should fail' '
        ! test -f nonexistingfile &&
        ! tag_exists notag &&
        'trying to create a tag with a non-existing -F file should fail' '
        ! test -f nonexistingfile &&
        ! tag_exists notag &&

-       test_must_fail git-tag -F nonexistingfile notag &&
+       test_must_fail git tag -F nonexistingfile notag &&

        ! tag_exists notag
 '
 
        ! tag_exists notag
 '
 


@@ -343,11 +343,11 @@ test_expect_success \
        echo "message file 1" >msgfile1 &&
        echo "message file 2" >msgfile2 &&
        ! tag_exists msgtag &&
        echo "message file 1" >msgfile1 &&
        echo "message file 2" >msgfile2 &&
        ! tag_exists msgtag &&

-       test_must_fail git-tag -m "message 1" -F msgfile1 msgtag &&
+       test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&

        ! tag_exists msgtag &&
        ! tag_exists msgtag &&

-       test_must_fail git-tag -F msgfile1 -m "message 1" msgtag &&
+       test_must_fail git tag -F msgfile1 -m "message 1" msgtag &&

        ! tag_exists msgtag &&
        ! tag_exists msgtag &&

-       test_must_fail git-tag -m "message 1" -F msgfile1 \
+       test_must_fail git tag -m "message 1" -F msgfile1 \

                -m "message 2" msgtag &&
        ! tag_exists msgtag
 '
                -m "message 2" msgtag &&
        ! tag_exists msgtag
 '


@@ -357,7 +357,7 @@ test_expect_success \
 get_tag_header empty-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with an empty -m message should succeed' '
 get_tag_header empty-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with an empty -m message should succeed' '

-       git-tag -m "" empty-annotated-tag &&
+       git tag -m "" empty-annotated-tag &&

        get_tag_msg empty-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg empty-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -366,7 +366,7 @@ test_expect_success \
 get_tag_header emptyfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with an empty -F messagefile should succeed' '
 get_tag_header emptyfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with an empty -F messagefile should succeed' '

-       git-tag -F emptyfile emptyfile-annotated-tag &&
+       git tag -F emptyfile emptyfile-annotated-tag &&

        get_tag_msg emptyfile-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg emptyfile-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -387,7 +387,7 @@ Trailing blank lines
 EOF
 test_expect_success \
        'extra blanks in the message for an annotated tag should be removed' '
 EOF
 test_expect_success \
        'extra blanks in the message for an annotated tag should be removed' '

-       git-tag -F blanksfile blanks-annotated-tag &&
+       git tag -F blanksfile blanks-annotated-tag &&

        get_tag_msg blanks-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg blanks-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -395,7 +395,7 @@ test_expect_success \
 get_tag_header blank-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with blank -m message with spaces should succeed' '
 get_tag_header blank-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with blank -m message with spaces should succeed' '

-       git-tag -m "     " blank-annotated-tag &&
+       git tag -m "     " blank-annotated-tag &&

        get_tag_msg blank-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg blank-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -406,7 +406,7 @@ echo '  '    >>blankfile
 get_tag_header blankfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with blank -F messagefile with spaces should succeed' '
 get_tag_header blankfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with blank -F messagefile with spaces should succeed' '

-       git-tag -F blankfile blankfile-annotated-tag &&
+       git tag -F blankfile blankfile-annotated-tag &&

        get_tag_msg blankfile-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg blankfile-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -415,7 +415,7 @@ printf '      ' >blanknonlfile
 get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with -F file of spaces and no newline should succeed' '
 get_tag_header blanknonlfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with -F file of spaces and no newline should succeed' '

-       git-tag -F blanknonlfile blanknonlfile-annotated-tag &&
+       git tag -F blanknonlfile blanknonlfile-annotated-tag &&

        get_tag_msg blanknonlfile-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg blanknonlfile-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -450,7 +450,7 @@ Last line.
 EOF
 test_expect_success \
        'creating a tag using a -F messagefile with #comments should succeed' '
 EOF
 test_expect_success \
        'creating a tag using a -F messagefile with #comments should succeed' '

-       git-tag -F commentsfile comments-annotated-tag &&
+       git tag -F commentsfile comments-annotated-tag &&

        get_tag_msg comments-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg comments-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -458,7 +458,7 @@ test_expect_success \
 get_tag_header comment-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with a #comment in the -m message should succeed' '
 get_tag_header comment-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with a #comment in the -m message should succeed' '

-       git-tag -m "#comment" comment-annotated-tag &&
+       git tag -m "#comment" comment-annotated-tag &&

        get_tag_msg comment-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg comment-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -469,7 +469,7 @@ echo '####'     >>commentfile
 get_tag_header commentfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with #comments in the -F messagefile should succeed' '
 get_tag_header commentfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with #comments in the -F messagefile should succeed' '

-       git-tag -F commentfile commentfile-annotated-tag &&
+       git tag -F commentfile commentfile-annotated-tag &&

        get_tag_msg commentfile-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg commentfile-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -478,7 +478,7 @@ printf '#comment' >commentnonlfile
 get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with a file of #comment and no newline should succeed' '
 get_tag_header commentnonlfile-annotated-tag $commit commit $time >expect
 test_expect_success \
        'creating a tag with a file of #comment and no newline should succeed' '

-       git-tag -F commentnonlfile commentnonlfile-annotated-tag &&
+       git tag -F commentnonlfile commentnonlfile-annotated-tag &&

        get_tag_msg commentnonlfile-annotated-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg commentnonlfile-annotated-tag >actual &&
        test_cmp expect actual
 '


@@ -487,51 +487,51 @@ test_expect_success \
 
 test_expect_success \
        'listing the one-line message of a non-signed tag should succeed' '
 
 test_expect_success \
        'listing the one-line message of a non-signed tag should succeed' '

-       git-tag -m "A msg" tag-one-line &&
+       git tag -m "A msg" tag-one-line &&

 
        echo "tag-one-line" >expect &&
 
        echo "tag-one-line" >expect &&

-       git-tag -l | grep "^tag-one-line" >actual &&
+       git tag -l | grep "^tag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^tag-one-line" >actual &&
+       git tag -n0 -l | grep "^tag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l tag-one-line >actual &&
+       git tag -n0 -l tag-one-line >actual &&

        test_cmp expect actual &&
 
        echo "tag-one-line    A msg" >expect &&
        test_cmp expect actual &&
 
        echo "tag-one-line    A msg" >expect &&

-       git-tag -n1 -l | grep "^tag-one-line" >actual &&
+       git tag -n1 -l | grep "^tag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^tag-one-line" >actual &&
+       git tag -n -l | grep "^tag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l tag-one-line >actual &&
+       git tag -n1 -l tag-one-line >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l tag-one-line >actual &&
+       git tag -n2 -l tag-one-line >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n999 -l tag-one-line >actual &&
+       git tag -n999 -l tag-one-line >actual &&

        test_cmp expect actual
 '
 
 test_expect_success \
        'listing the zero-lines message of a non-signed tag should succeed' '
        test_cmp expect actual
 '
 
 test_expect_success \
        'listing the zero-lines message of a non-signed tag should succeed' '

-       git-tag -m "" tag-zero-lines &&
+       git tag -m "" tag-zero-lines &&

 
        echo "tag-zero-lines" >expect &&
 
        echo "tag-zero-lines" >expect &&

-       git-tag -l | grep "^tag-zero-lines" >actual &&
+       git tag -l | grep "^tag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^tag-zero-lines" >actual &&
+       git tag -n0 -l | grep "^tag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l tag-zero-lines >actual &&
+       git tag -n0 -l tag-zero-lines >actual &&

        test_cmp expect actual &&
 
        echo "tag-zero-lines  " >expect &&
        test_cmp expect actual &&
 
        echo "tag-zero-lines  " >expect &&

-       git-tag -n1 -l | grep "^tag-zero-lines" >actual &&
+       git tag -n1 -l | grep "^tag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^tag-zero-lines" >actual &&
+       git tag -n -l | grep "^tag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l tag-zero-lines >actual &&
+       git tag -n1 -l tag-zero-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l tag-zero-lines >actual &&
+       git tag -n2 -l tag-zero-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n999 -l tag-zero-lines >actual &&
+       git tag -n999 -l tag-zero-lines >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -540,42 +540,42 @@ echo 'tag line two' >>annotagmsg
 echo 'tag line three' >>annotagmsg
 test_expect_success \
        'listing many message lines of a non-signed tag should succeed' '
 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 &&
+       git tag -F annotagmsg tag-lines &&

 
        echo "tag-lines" >expect &&
 
        echo "tag-lines" >expect &&

-       git-tag -l | grep "^tag-lines" >actual &&
+       git tag -l | grep "^tag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^tag-lines" >actual &&
+       git tag -n0 -l | grep "^tag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l tag-lines >actual &&
+       git tag -n0 -l tag-lines >actual &&

        test_cmp expect actual &&
 
        echo "tag-lines       tag line one" >expect &&
        test_cmp expect actual &&
 
        echo "tag-lines       tag line one" >expect &&

-       git-tag -n1 -l | grep "^tag-lines" >actual &&
+       git tag -n1 -l | grep "^tag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^tag-lines" >actual &&
+       git tag -n -l | grep "^tag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l tag-lines >actual &&
+       git tag -n1 -l tag-lines >actual &&

        test_cmp expect actual &&
 
        echo "    tag line two" >>expect &&
        test_cmp expect actual &&
 
        echo "    tag line two" >>expect &&

-       git-tag -n2 -l | grep "^ *tag.line" >actual &&
+       git tag -n2 -l | grep "^ *tag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l tag-lines >actual &&
+       git tag -n2 -l tag-lines >actual &&

        test_cmp expect actual &&
 
        echo "    tag line three" >>expect &&
        test_cmp expect actual &&
 
        echo "    tag line three" >>expect &&

-       git-tag -n3 -l | grep "^ *tag.line" >actual &&
+       git tag -n3 -l | grep "^ *tag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n3 -l tag-lines >actual &&
+       git tag -n3 -l tag-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n4 -l | grep "^ *tag.line" >actual &&
+       git tag -n4 -l | grep "^ *tag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n4 -l tag-lines >actual &&
+       git tag -n4 -l tag-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n99 -l | grep "^ *tag.line" >actual &&
+       git tag -n99 -l | grep "^ *tag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n99 -l tag-lines >actual &&
+       git tag -n99 -l tag-lines >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -592,19 +592,19 @@ fi
 test_expect_success \
        'trying to verify an annotated non-signed tag should fail' '
        tag_exists annotated-tag &&
 test_expect_success \
        'trying to verify an annotated non-signed tag should fail' '
        tag_exists annotated-tag &&

-       test_must_fail git-tag -v annotated-tag
+       test_must_fail git tag -v annotated-tag

 '
 
 test_expect_success \
        'trying to verify a file-annotated non-signed tag should fail' '
        tag_exists file-annotated-tag &&
 '
 
 test_expect_success \
        'trying to verify a file-annotated non-signed tag should fail' '
        tag_exists file-annotated-tag &&

-       test_must_fail git-tag -v file-annotated-tag
+       test_must_fail 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 &&
 '
 
 test_expect_success \
        'trying to verify two annotated non-signed tags should fail' '
        tag_exists annotated-tag file-annotated-tag &&

-       test_must_fail git-tag -v annotated-tag file-annotated-tag
+       test_must_fail git tag -v annotated-tag file-annotated-tag

 '
 
 # creating and verifying signed tags:
 '
 
 # creating and verifying signed tags:


@@ -634,7 +634,7 @@ get_tag_header signed-tag $commit commit $time >expect
 echo 'A signed tag message' >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success 'creating a signed tag with -m message should succeed' '
 echo 'A signed tag message' >>expect
 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 &&
+       git tag -s -m "A signed tag message" signed-tag &&

        get_tag_msg signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg signed-tag >actual &&
        test_cmp expect actual
 '


@@ -675,7 +675,7 @@ get_tag_header implied-sign $commit commit $time >expect
 ./fakeeditor >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success '-u implies signed tag' '
 ./fakeeditor >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success '-u implies signed tag' '

-       GIT_EDITOR=./fakeeditor git-tag -u CDDE430D implied-sign &&
+       GIT_EDITOR=./fakeeditor git tag -u CDDE430D implied-sign &&

        get_tag_msg implied-sign >actual &&
        test_cmp expect actual
 '
        get_tag_msg implied-sign >actual &&
        test_cmp expect actual
 '


@@ -689,7 +689,7 @@ cat sigmsgfile >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with -F messagefile should succeed' '
 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 &&
+       git tag -s -F sigmsgfile file-signed-tag &&

        get_tag_msg file-signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg file-signed-tag >actual &&
        test_cmp expect actual
 '


@@ -702,7 +702,7 @@ 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' '
 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 &&
+       git tag -s -F - stdin-signed-tag <siginputmsg &&

        get_tag_msg stdin-signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg stdin-signed-tag >actual &&
        test_cmp expect actual
 '


@@ -711,7 +711,7 @@ get_tag_header implied-annotate $commit commit $time >expect
 ./fakeeditor >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success '-s implies annotated tag' '
 ./fakeeditor >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success '-s implies annotated tag' '

-       GIT_EDITOR=./fakeeditor git-tag -s implied-annotate &&
+       GIT_EDITOR=./fakeeditor git tag -s implied-annotate &&

        get_tag_msg implied-annotate >actual &&
        test_cmp expect actual
 '
        get_tag_msg implied-annotate >actual &&
        test_cmp expect actual
 '


@@ -720,23 +720,23 @@ test_expect_success \
        'trying to create a signed tag with non-existing -F file should fail' '
        ! test -f nonexistingfile &&
        ! tag_exists nosigtag &&
        'trying to create a signed tag with non-existing -F file should fail' '
        ! test -f nonexistingfile &&
        ! tag_exists nosigtag &&

-       test_must_fail git-tag -s -F nonexistingfile nosigtag &&
+       test_must_fail git tag -s -F nonexistingfile nosigtag &&

        ! tag_exists nosigtag
 '
 
 test_expect_success 'verifying a signed tag should succeed' \
        ! tag_exists nosigtag
 '
 
 test_expect_success 'verifying a signed tag should succeed' \

-       'git-tag -v signed-tag'
+       'git tag -v signed-tag'

 
 test_expect_success 'verifying two signed tags in one command should succeed' \
 
 test_expect_success 'verifying two signed tags in one command should succeed' \

-       'git-tag -v signed-tag file-signed-tag'
+       'git tag -v signed-tag file-signed-tag'

 
 test_expect_success \
        'verifying many signed and non-signed tags should fail' '
 
 test_expect_success \
        'verifying many signed and non-signed tags should fail' '

-       test_must_fail git-tag -v signed-tag annotated-tag &&
-       test_must_fail git-tag -v file-annotated-tag file-signed-tag &&
-       test_must_fail git-tag -v annotated-tag \
+       test_must_fail git tag -v signed-tag annotated-tag &&
+       test_must_fail git tag -v file-annotated-tag file-signed-tag &&
+       test_must_fail git tag -v annotated-tag \

                file-signed-tag file-annotated-tag &&
                file-signed-tag file-annotated-tag &&

-       test_must_fail git-tag -v signed-tag annotated-tag file-signed-tag
+       test_must_fail git tag -v signed-tag annotated-tag file-signed-tag

 '
 
 test_expect_success 'verifying a forged tag should fail' '
 '
 
 test_expect_success 'verifying a forged tag should fail' '


@@ -744,7 +744,7 @@ test_expect_success 'verifying a forged tag should fail' '
                sed -e "s/signed-tag/forged-tag/" |
                git mktag) &&
        git tag forged-tag $forged &&
                sed -e "s/signed-tag/forged-tag/" |
                git mktag) &&
        git tag forged-tag $forged &&

-       test_must_fail git-tag -v forged-tag
+       test_must_fail git tag -v forged-tag

 '
 
 # blank and empty messages for signed tags:
 '
 
 # blank and empty messages for signed tags:


@@ -753,10 +753,10 @@ get_tag_header empty-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with an empty -m message should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with an empty -m message should succeed' '

-       git-tag -s -m "" empty-signed-tag &&
+       git tag -s -m "" empty-signed-tag &&

        get_tag_msg empty-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg empty-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v empty-signed-tag
+       git tag -v empty-signed-tag

 '
 
 >sigemptyfile
 '
 
 >sigemptyfile


@@ -764,10 +764,10 @@ get_tag_header emptyfile-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with an empty -F messagefile should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with an empty -F messagefile should succeed' '

-       git-tag -s -F sigemptyfile emptyfile-signed-tag &&
+       git tag -s -F sigemptyfile emptyfile-signed-tag &&

        get_tag_msg emptyfile-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg emptyfile-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v emptyfile-signed-tag
+       git tag -v emptyfile-signed-tag

 '
 
 printf '\n\n  \n\t\nLeading blank lines\n' > sigblanksfile
 '
 
 printf '\n\n  \n\t\nLeading blank lines\n' > sigblanksfile


@@ -787,20 +787,20 @@ EOF
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'extra blanks in the message for a signed tag should be removed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'extra blanks in the message for a signed tag should be removed' '

-       git-tag -s -F sigblanksfile blanks-signed-tag &&
+       git tag -s -F sigblanksfile blanks-signed-tag &&

        get_tag_msg blanks-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg blanks-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v blanks-signed-tag
+       git tag -v blanks-signed-tag

 '
 
 get_tag_header blank-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a blank -m message should succeed' '
 '
 
 get_tag_header blank-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a blank -m message should succeed' '

-       git-tag -s -m "     " blank-signed-tag &&
+       git tag -s -m "     " blank-signed-tag &&

        get_tag_msg blank-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg blank-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v blank-signed-tag
+       git tag -v blank-signed-tag

 '
 
 echo '     ' >sigblankfile
 '
 
 echo '     ' >sigblankfile


@@ -810,10 +810,10 @@ get_tag_header blankfile-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with blank -F file with spaces should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with blank -F file with spaces should succeed' '

-       git-tag -s -F sigblankfile blankfile-signed-tag &&
+       git tag -s -F sigblankfile blankfile-signed-tag &&

        get_tag_msg blankfile-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg blankfile-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v blankfile-signed-tag
+       git tag -v blankfile-signed-tag

 '
 
 printf '      ' >sigblanknonlfile
 '
 
 printf '      ' >sigblanknonlfile


@@ -821,10 +821,10 @@ get_tag_header blanknonlfile-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with spaces and no newline should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with spaces and no newline should succeed' '

-       git-tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&
+       git tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&

        get_tag_msg blanknonlfile-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg blanknonlfile-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v signed-tag
+       git tag -v signed-tag

 '
 
 # messages with commented lines for signed tags:
 '
 
 # messages with commented lines for signed tags:


@@ -858,20 +858,20 @@ EOF
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a -F file with #comments should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a -F file with #comments should succeed' '

-       git-tag -s -F sigcommentsfile comments-signed-tag &&
+       git tag -s -F sigcommentsfile comments-signed-tag &&

        get_tag_msg comments-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg comments-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v comments-signed-tag
+       git tag -v comments-signed-tag

 '
 
 get_tag_header comment-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with #commented -m message should succeed' '
 '
 
 get_tag_header comment-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with #commented -m message should succeed' '

-       git-tag -s -m "#comment" comment-signed-tag &&
+       git tag -s -m "#comment" comment-signed-tag &&

        get_tag_msg comment-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg comment-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v comment-signed-tag
+       git tag -v comment-signed-tag

 '
 
 echo '#comment' >sigcommentfile
 '
 
 echo '#comment' >sigcommentfile


@@ -881,10 +881,10 @@ get_tag_header commentfile-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with #commented -F messagefile should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with #commented -F messagefile should succeed' '

-       git-tag -s -F sigcommentfile commentfile-signed-tag &&
+       git tag -s -F sigcommentfile commentfile-signed-tag &&

        get_tag_msg commentfile-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg commentfile-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v commentfile-signed-tag
+       git tag -v commentfile-signed-tag

 '
 
 printf '#comment' >sigcommentnonlfile
 '
 
 printf '#comment' >sigcommentnonlfile


@@ -892,61 +892,61 @@ get_tag_header commentnonlfile-signed-tag $commit commit $time >expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a #comment and no newline should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag with a #comment and no newline should succeed' '

-       git-tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&
+       git tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&

        get_tag_msg commentnonlfile-signed-tag >actual &&
        test_cmp expect actual &&
        get_tag_msg commentnonlfile-signed-tag >actual &&
        test_cmp expect actual &&

-       git-tag -v commentnonlfile-signed-tag
+       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' '
 '
 
 # 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 &&
+       git tag -s -m "A message line signed" stag-one-line &&

 
        echo "stag-one-line" >expect &&
 
        echo "stag-one-line" >expect &&

-       git-tag -l | grep "^stag-one-line" >actual &&
+       git tag -l | grep "^stag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^stag-one-line" >actual &&
+       git tag -n0 -l | grep "^stag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l stag-one-line >actual &&
+       git tag -n0 -l stag-one-line >actual &&

        test_cmp expect actual &&
 
        echo "stag-one-line   A message line signed" >expect &&
        test_cmp expect actual &&
 
        echo "stag-one-line   A message line signed" >expect &&

-       git-tag -n1 -l | grep "^stag-one-line" >actual &&
+       git tag -n1 -l | grep "^stag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^stag-one-line" >actual &&
+       git tag -n -l | grep "^stag-one-line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l stag-one-line >actual &&
+       git tag -n1 -l stag-one-line >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l stag-one-line >actual &&
+       git tag -n2 -l stag-one-line >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n999 -l stag-one-line >actual &&
+       git tag -n999 -l stag-one-line >actual &&

        test_cmp expect actual
 '
 
 test_expect_success \
        'listing the zero-lines message of a signed tag should succeed' '
        test_cmp expect actual
 '
 
 test_expect_success \
        'listing the zero-lines message of a signed tag should succeed' '

-       git-tag -s -m "" stag-zero-lines &&
+       git tag -s -m "" stag-zero-lines &&

 
        echo "stag-zero-lines" >expect &&
 
        echo "stag-zero-lines" >expect &&

-       git-tag -l | grep "^stag-zero-lines" >actual &&
+       git tag -l | grep "^stag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^stag-zero-lines" >actual &&
+       git tag -n0 -l | grep "^stag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l stag-zero-lines >actual &&
+       git tag -n0 -l stag-zero-lines >actual &&

        test_cmp expect actual &&
 
        echo "stag-zero-lines " >expect &&
        test_cmp expect actual &&
 
        echo "stag-zero-lines " >expect &&

-       git-tag -n1 -l | grep "^stag-zero-lines" >actual &&
+       git tag -n1 -l | grep "^stag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^stag-zero-lines" >actual &&
+       git tag -n -l | grep "^stag-zero-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l stag-zero-lines >actual &&
+       git tag -n1 -l stag-zero-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l stag-zero-lines >actual &&
+       git tag -n2 -l stag-zero-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n999 -l stag-zero-lines >actual &&
+       git tag -n999 -l stag-zero-lines >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -955,42 +955,42 @@ echo 'stag line two' >>sigtagmsg
 echo 'stag line three' >>sigtagmsg
 test_expect_success \
        'listing many message lines of a signed tag should succeed' '
 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 &&
+       git tag -s -F sigtagmsg stag-lines &&

 
        echo "stag-lines" >expect &&
 
        echo "stag-lines" >expect &&

-       git-tag -l | grep "^stag-lines" >actual &&
+       git tag -l | grep "^stag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l | grep "^stag-lines" >actual &&
+       git tag -n0 -l | grep "^stag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n0 -l stag-lines >actual &&
+       git tag -n0 -l stag-lines >actual &&

        test_cmp expect actual &&
 
        echo "stag-lines      stag line one" >expect &&
        test_cmp expect actual &&
 
        echo "stag-lines      stag line one" >expect &&

-       git-tag -n1 -l | grep "^stag-lines" >actual &&
+       git tag -n1 -l | grep "^stag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n -l | grep "^stag-lines" >actual &&
+       git tag -n -l | grep "^stag-lines" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n1 -l stag-lines >actual &&
+       git tag -n1 -l stag-lines >actual &&

        test_cmp expect actual &&
 
        echo "    stag line two" >>expect &&
        test_cmp expect actual &&
 
        echo "    stag line two" >>expect &&

-       git-tag -n2 -l | grep "^ *stag.line" >actual &&
+       git tag -n2 -l | grep "^ *stag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n2 -l stag-lines >actual &&
+       git tag -n2 -l stag-lines >actual &&

        test_cmp expect actual &&
 
        echo "    stag line three" >>expect &&
        test_cmp expect actual &&
 
        echo "    stag line three" >>expect &&

-       git-tag -n3 -l | grep "^ *stag.line" >actual &&
+       git tag -n3 -l | grep "^ *stag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n3 -l stag-lines >actual &&
+       git tag -n3 -l stag-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n4 -l | grep "^ *stag.line" >actual &&
+       git tag -n4 -l | grep "^ *stag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n4 -l stag-lines >actual &&
+       git tag -n4 -l stag-lines >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n99 -l | grep "^ *stag.line" >actual &&
+       git tag -n99 -l | grep "^ *stag.line" >actual &&

        test_cmp expect actual &&
        test_cmp expect actual &&

-       git-tag -n99 -l stag-lines >actual &&
+       git tag -n99 -l stag-lines >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '
 


@@ -1005,7 +1005,7 @@ echo "A message for a tree" >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to a tree should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to a tree should succeed' '

-       git-tag -s -m "A message for a tree" tree-signed-tag HEAD^{tree} &&
+       git tag -s -m "A message for a tree" tree-signed-tag HEAD^{tree} &&

        get_tag_msg tree-signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg tree-signed-tag >actual &&
        test_cmp expect actual
 '


@@ -1015,7 +1015,7 @@ echo "A message for a blob" >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to a blob should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to a blob should succeed' '

-       git-tag -s -m "A message for a blob" blob-signed-tag HEAD:foo &&
+       git tag -s -m "A message for a blob" blob-signed-tag HEAD:foo &&

        get_tag_msg blob-signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg blob-signed-tag >actual &&
        test_cmp expect actual
 '


@@ -1025,7 +1025,7 @@ echo "A message for another tag" >>expect
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to another tag should succeed' '
 echo '-----BEGIN PGP SIGNATURE-----' >>expect
 test_expect_success \
        'creating a signed tag pointing to another tag should succeed' '

-       git-tag -s -m "A message for another tag" tag-signed-tag signed-tag &&
+       git tag -s -m "A message for another tag" tag-signed-tag signed-tag &&

        get_tag_msg tag-signed-tag >actual &&
        test_cmp expect actual
 '
        get_tag_msg tag-signed-tag >actual &&
        test_cmp expect actual
 '


@@ -1033,7 +1033,7 @@ test_expect_success \
 # try to sign with bad user.signingkey
 git config user.signingkey BobTheMouse
 test_expect_success \
 # try to sign with bad user.signingkey
 git config user.signingkey BobTheMouse
 test_expect_success \

-       'git-tag -s fails if gpg is misconfigured' \
+       'git tag -s fails if gpg is misconfigured' \

        'test_must_fail git tag -s -m tail tag-gpg-failure'
 git config --unset user.signingkey
 
        'test_must_fail git tag -s -m tail tag-gpg-failure'
 git config --unset user.signingkey
 


@@ -1042,10 +1042,10 @@ git config --unset user.signingkey
 rm -rf gpghome
 test_expect_success \
        'verify signed tag fails when public key is not present' \
 rm -rf gpghome
 test_expect_success \
        'verify signed tag fails when public key is not present' \

-       'test_must_fail git-tag -v signed-tag'
+       'test_must_fail git tag -v signed-tag'

 
 test_expect_success \
 
 test_expect_success \

-       'git-tag -a fails if tag annotation is empty' '
+       'git tag -a fails if tag annotation is empty' '

        ! (GIT_EDITOR=cat git tag -a initial-comment)
 '
 
        ! (GIT_EDITOR=cat git tag -a initial-comment)
 '
 

diff --git a/t/t7101-reset.sh b/t/t7101-reset.sh
index 0d9874bfd7082f9ef16c1f6b3ff8a848a19d8937..c4ef19e402c7f4097842b9902a751ead46703974 100755 (executable)
--- a/t/t7101-reset.sh
+++ b/t/t7101-reset.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Shawn Pearce
 #
 
 # Copyright (c) 2006 Shawn Pearce
 #
 

-test_description='git-reset should cull empty subdirs'
+test_description='git reset should cull empty subdirs'

 . ./test-lib.sh
 
 test_expect_success \
 . ./test-lib.sh
 
 test_expect_success \


@@ -11,7 +11,7 @@ test_expect_success \
     'mkdir path0 &&
      cp ../../COPYING path0/COPYING &&
      git add path0/COPYING &&
     'mkdir path0 &&
      cp ../../COPYING path0/COPYING &&
      git add path0/COPYING &&

-     git-commit -m add -a'
+     git commit -m add -a'

 
 test_expect_success \
     'creating second files' \
 
 test_expect_success \
     'creating second files' \


@@ -25,11 +25,11 @@ test_expect_success \
      git add path1/COPYING &&
      git add COPYING &&
      git add path0/COPYING-TOO &&
      git add path1/COPYING &&
      git add COPYING &&
      git add path0/COPYING-TOO &&

-     git-commit -m change -a'
+     git commit -m change -a'

 
 test_expect_success \
     'resetting tree HEAD^' \
 
 test_expect_success \
     'resetting tree HEAD^' \

-    'git-reset --hard HEAD^'
+    'git reset --hard HEAD^'

 
 test_expect_success \
     'checking initial files exist after rewind' \
 
 test_expect_success \
     'checking initial files exist after rewind' \

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 29f5678b4c93485ad492fa865a5da58a3cc05b7c..e637c7d4dbdce337b4d005719c4aa86d447a70d9 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -3,9 +3,9 @@
 # Copyright (c) 2007 Carlos Rica
 #
 
 # Copyright (c) 2007 Carlos Rica
 #
 

-test_description='git-reset
+test_description='git reset

 
 

-Documented tests for git-reset'
+Documented tests for git reset'

 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

diff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh
index cdecebe456c7a9cf30465b112a24ce7bcf76f344..42bf518c68e6ef07c8be1af714723b2f900a573c 100755 (executable)
--- a/t/t7103-reset-bare.sh
+++ b/t/t7103-reset-bare.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-reset in a bare repository'
+test_description='git reset in a bare repository'

 . ./test-lib.sh
 
 test_expect_success 'setup non-bare' '
 . ./test-lib.sh
 
 test_expect_success 'setup non-bare' '