{"thread":{"id":"15350","subject":"[PATCH 3/4] tests: use \"git xyzzy\" form (t7000 - t7199)","startedAt":"2008-09-03T08:59:31Z","lastAt":"2008-09-03T08:59:31Z","messageCount":1,"participants":["Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"89602","messageId":"20080903175931.6117@nanako3.lavabit.com","threadId":"15350","inReplyTo":null,"subject":"[PATCH 3/4] tests: use \"git xyzzy\" form (t7000 - t7199)","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-03T08:59:31Z","receivedAt":"2008-09-03T08:59:31Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Converts tests between t7001-t7103.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t7001-mv.sh            |   12 +-\n t/t7003-filter-branch.sh |   22 ++--\n t/t7004-tag.sh           |  318 +++++++++++++++++++++++-----------------------\n t/t7101-reset.sh         |    8 +-\n t/t7102-reset.sh         |    4 +-\n t/t7103-reset-bare.sh    |    2 +-\n 6 files changed, 183 insertions(+), 183 deletions(-)\n\ndiff --git a/t/t7001-mv.sh b/t/t7001-mv.sh\nindex 7816798..575ef5b 100755\n--- a/t/t7001-mv.sh\n+++ b/t/t7001-mv.sh\n@@ -10,3 +10,3 @@ test_expect_success \\\n      git add path0/COPYING &&\n-     git-commit -m add -a'\n+     git commit -m add -a'\n \n@@ -19,3 +19,3 @@ test_expect_success \\\n     'commiting the change' \\\n-    'cd .. && git-commit -m move-out -a'\n+    'cd .. && git commit -m move-out -a'\n \n@@ -33,3 +33,3 @@ test_expect_success \\\n     'commiting the change' \\\n-    'cd .. && git-commit -m move-in -a'\n+    'cd .. && git commit -m move-in -a'\n \n@@ -44,3 +44,3 @@ test_expect_success \\\n      git add path0/README &&\n-     git-commit -m add2 -a'\n+     git commit -m add2 -a'\n \n@@ -52,3 +52,3 @@ test_expect_success \\\n     'commiting the change' \\\n-    'git-commit -m dir-move -a'\n+    'git commit -m dir-move -a'\n \n@@ -71,3 +71,3 @@ test_expect_success \\\n     'commiting the change' \\\n-    'git-commit -m dir-move -a'\n+    'git commit -m dir-move -a'\n \ndiff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh\nindex 95f13a8..b0a9d7d 100755\n--- a/t/t7003-filter-branch.sh\n+++ b/t/t7003-filter-branch.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-filter-branch'\n+test_description='git filter-branch'\n . ./test-lib.sh\n@@ -34,3 +34,3 @@ H=$(git rev-parse H)\n test_expect_success 'rewrite identically' '\n-\tgit-filter-branch branch\n+\tgit filter-branch branch\n '\n@@ -41,3 +41,3 @@ test_expect_success 'result is really identical' '\n test_expect_success 'rewrite bare repository identically' '\n-\t(git config core.bare true && cd .git && git-filter-branch branch)\n+\t(git config core.bare true && cd .git && git filter-branch branch)\n '\n@@ -49,3 +49,3 @@ test_expect_success 'result is really identical' '\n test_expect_success 'rewrite, renaming a specific file' '\n-\tgit-filter-branch -f --tree-filter \"mv d doh || :\" HEAD\n+\tgit filter-branch -f --tree-filter \"mv d doh || :\" HEAD\n '\n@@ -60,3 +60,3 @@ test_expect_success 'test that the file was renamed' '\n test_expect_success 'rewrite, renaming a specific directory' '\n-\tgit-filter-branch -f --tree-filter \"mv dir diroh || :\" HEAD\n+\tgit filter-branch -f --tree-filter \"mv dir diroh || :\" HEAD\n '\n@@ -75,3 +75,3 @@ test_expect_success 'rewrite one branch, keeping a side branch' '\n \tgit branch modD oldD &&\n-\tgit-filter-branch -f --tree-filter \"mv b boh || :\" D..modD\n+\tgit filter-branch -f --tree-filter \"mv b boh || :\" D..modD\n '\n@@ -99,3 +99,3 @@ test_expect_success 'filter subdirectory only' '\n \tgit branch sub-earlier HEAD~2 &&\n-\tgit-filter-branch -f --subdirectory-filter subdir \\\n+\tgit filter-branch -f --subdirectory-filter subdir \\\n \t\trefs/heads/sub refs/heads/sub-earlier\n@@ -126,3 +126,3 @@ test_expect_success 'use index-filter to move into a subdirectory' '\n \tgit branch directorymoved &&\n-\tgit-filter-branch -f --index-filter \\\n+\tgit filter-branch -f --index-filter \\\n \t\t \"git ls-files -s | sed \\\"s-\\\\t-&newsubdir/-\\\" |\n@@ -135,3 +135,3 @@ test_expect_success 'stops when msg filter fails' '\n \told=$(git rev-parse HEAD) &&\n-\ttest_must_fail git-filter-branch -f --msg-filter false HEAD &&\n+\ttest_must_fail git filter-branch -f --msg-filter false HEAD &&\n \ttest $old = $(git rev-parse HEAD) &&\n@@ -146,3 +146,3 @@ test_expect_success 'author information is preserved' '\n \tgit branch preserved-author &&\n-\tgit-filter-branch -f --msg-filter \"cat; \\\n+\tgit filter-branch -f --msg-filter \"cat; \\\n \t\t\ttest \\$GIT_COMMIT != $(git rev-parse master) || \\\n@@ -158,3 +158,3 @@ test_expect_success \"remove a certain author's commits\" '\n \tgit branch removed-author &&\n-\tgit-filter-branch -f --commit-filter \"\\\n+\tgit filter-branch -f --commit-filter \"\\\n \t\tif [ \\\"\\$GIT_AUTHOR_NAME\\\" = \\\"B V Uips\\\" ];\\\ndiff --git a/t/t7004-tag.sh b/t/t7004-tag.sh\nindex 198244c..f0edbf1 100755\n--- a/t/t7004-tag.sh\n+++ b/t/t7004-tag.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-tag\n+test_description='git tag\n \n@@ -24,4 +24,4 @@ test_expect_success 'listing all tags in an empty tree should succeed' '\n test_expect_success 'listing all tags in an empty tree should output nothing' '\n-\ttest `git-tag -l | wc -l` -eq 0 &&\n-\ttest `git-tag | wc -l` -eq 0\n+\ttest `git tag -l | wc -l` -eq 0 &&\n+\ttest `git tag | wc -l` -eq 0\n '\n@@ -32,3 +32,3 @@ test_expect_success 'looking for a tag in an empty tree should fail' \\\n test_expect_success 'creating a tag in an empty tree should fail' '\n-\ttest_must_fail git-tag mynotag &&\n+\ttest_must_fail git tag mynotag &&\n \t! tag_exists mynotag\n@@ -37,3 +37,3 @@ test_expect_success 'creating a tag in an empty tree should fail' '\n test_expect_success 'creating a tag for HEAD in an empty tree should fail' '\n-\ttest_must_fail git-tag mytaghead HEAD &&\n+\ttest_must_fail git tag mytaghead HEAD &&\n \t! tag_exists mytaghead\n@@ -42,3 +42,3 @@ test_expect_success 'creating a tag for HEAD in an empty tree should fail' '\n test_expect_success 'creating a tag for an unknown revision should fail' '\n-\ttest_must_fail git-tag mytagnorev aaaaaaaaaaa &&\n+\ttest_must_fail git tag mytagnorev aaaaaaaaaaa &&\n \t! tag_exists mytagnorev\n@@ -56,4 +56,4 @@ test_expect_success 'creating a tag using default HEAD should succeed' '\n test_expect_success 'listing all tags if one exists should succeed' '\n-\tgit-tag -l &&\n-\tgit-tag\n+\tgit tag -l &&\n+\tgit tag\n '\n@@ -61,4 +61,4 @@ test_expect_success 'listing all tags if one exists should succeed' '\n test_expect_success 'listing all tags if one exists should output that tag' '\n-\ttest `git-tag -l` = mytag &&\n-\ttest `git-tag` = mytag\n+\ttest `git tag -l` = mytag &&\n+\ttest `git tag` = mytag\n '\n@@ -68,3 +68,3 @@ test_expect_success 'listing all tags if one exists should output that tag' '\n test_expect_success 'listing a tag using a matching pattern should succeed' \\\n-\t'git-tag -l mytag'\n+\t'git tag -l mytag'\n \n@@ -72,3 +72,3 @@ test_expect_success \\\n \t'listing a tag using a matching pattern should output that tag' \\\n-\t'test `git-tag -l mytag` = mytag'\n+\t'test `git tag -l mytag` = mytag'\n \n@@ -77,3 +77,3 @@ test_expect_success \\\n \t'listing tags using a non-matching pattern should suceed' \\\n-\t'git-tag -l xxx'\n+\t'git tag -l xxx'\n \n@@ -81,3 +81,3 @@ test_expect_success \\\n \t'listing tags using a non-matching pattern should output nothing' \\\n-\t'test `git-tag -l xxx | wc -l` -eq 0'\n+\t'test `git tag -l xxx | wc -l` -eq 0'\n \n@@ -91,3 +91,3 @@ test_expect_success \\\n \t'trying to create a tag with a non-valid name should fail' '\n-\ttest `git-tag -l | wc -l` -eq 1 &&\n+\ttest `git tag -l | wc -l` -eq 1 &&\n \ttest_must_fail git tag \"\" &&\n@@ -97,3 +97,3 @@ test_expect_success \\\n \ttest_must_fail git tag \"other~tag\" &&\n-\ttest `git-tag -l | wc -l` -eq 1\n+\ttest `git tag -l | wc -l` -eq 1\n '\n@@ -109,3 +109,3 @@ test_expect_success 'trying to delete an unknown tag should fail' '\n \t! tag_exists unknown-tag &&\n-\ttest_must_fail git-tag -d unknown-tag\n+\ttest_must_fail git tag -d unknown-tag\n '\n@@ -119,3 +119,3 @@ test_expect_success \\\n \tgit tag -l > actual && test_cmp expect actual &&\n-\tgit-tag -d &&\n+\tgit tag -d &&\n \tgit tag -l > actual && test_cmp expect actual\n@@ -127,3 +127,3 @@ test_expect_success \\\n \ttag_exists myhead &&\n-\tgit-tag -d mytag myhead &&\n+\tgit tag -d mytag myhead &&\n \t! tag_exists mytag &&\n@@ -135,3 +135,3 @@ test_expect_success \\\n \t! tag_exists mytag &&\n-\tgit-tag mytag &&\n+\tgit tag mytag &&\n \ttag_exists mytag\n@@ -143,3 +143,3 @@ test_expect_success \\\n \t! tag_exists myhead &&\n-\ttest_must_fail git-tag -d mytag anothertag &&\n+\ttest_must_fail git tag -d mytag anothertag &&\n \t! tag_exists mytag &&\n@@ -149,3 +149,3 @@ test_expect_success \\\n test_expect_success 'trying to delete an already deleted tag should fail' \\\n-\t'test_must_fail git-tag -d mytag'\n+\t'test_must_fail git tag -d mytag'\n \n@@ -187,3 +187,3 @@ test_expect_success \\\n \t'listing tags with substring as pattern must print those matching' '\n-\tgit-tag -l \"*a*\" > actual &&\n+\tgit tag -l \"*a*\" > actual &&\n \ttest_cmp expect actual\n@@ -197,3 +197,3 @@ test_expect_success \\\n \t'listing tags with a suffix as pattern must print those matching' '\n-\tgit-tag -l \"*.1\" > actual &&\n+\tgit tag -l \"*.1\" > actual &&\n \ttest_cmp expect actual\n@@ -207,3 +207,3 @@ test_expect_success \\\n \t'listing tags with a prefix as pattern must print those matching' '\n-\tgit-tag -l \"t21*\" > actual &&\n+\tgit tag -l \"t21*\" > actual &&\n \ttest_cmp expect actual\n@@ -216,3 +216,3 @@ test_expect_success \\\n \t'listing tags using a name as pattern must print that one matching' '\n-\tgit-tag -l a1 > actual &&\n+\tgit tag -l a1 > actual &&\n \ttest_cmp expect actual\n@@ -225,3 +225,3 @@ test_expect_success \\\n \t'listing tags using a name as pattern must print that one matching' '\n-\tgit-tag -l v1.0 > actual &&\n+\tgit tag -l v1.0 > actual &&\n \ttest_cmp expect actual\n@@ -235,3 +235,3 @@ test_expect_success \\\n \t'listing tags with ? in the pattern should print those matching' '\n-\tgit-tag -l \"v1.?.?\" > actual &&\n+\tgit tag -l \"v1.?.?\" > actual &&\n \ttest_cmp expect actual\n@@ -242,3 +242,3 @@ test_expect_success \\\n \t'listing tags using v.* should print nothing because none have v.' '\n-\tgit-tag -l \"v.*\" > actual &&\n+\tgit tag -l \"v.*\" > actual &&\n \ttest_cmp expect actual\n@@ -254,3 +254,3 @@ test_expect_success \\\n \t'listing tags using v* should print only those having v' '\n-\tgit-tag -l \"v*\" > actual &&\n+\tgit tag -l \"v*\" > actual &&\n \ttest_cmp expect actual\n@@ -262,3 +262,3 @@ test_expect_success \\\n \t'a non-annotated tag created without parameters should point to HEAD' '\n-\tgit-tag non-annotated-tag &&\n+\tgit tag non-annotated-tag &&\n \ttest $(git cat-file -t non-annotated-tag) = commit &&\n@@ -268,3 +268,3 @@ test_expect_success \\\n test_expect_success 'trying to verify an unknown tag should fail' \\\n-\t'test_must_fail git-tag -v unknown-tag'\n+\t'test_must_fail git tag -v unknown-tag'\n \n@@ -272,3 +272,3 @@ test_expect_success \\\n \t'trying to verify a non-annotated and non-signed tag should fail' \\\n-\t'test_must_fail git-tag -v non-annotated-tag'\n+\t'test_must_fail git tag -v non-annotated-tag'\n \n@@ -276,3 +276,3 @@ test_expect_success \\\n \t'trying to verify many non-annotated or unknown tags, should fail' \\\n-\t'test_must_fail git-tag -v unknown-tag1 non-annotated-tag unknown-tag2'\n+\t'test_must_fail git tag -v unknown-tag1 non-annotated-tag unknown-tag2'\n \n@@ -302,3 +302,3 @@ test_expect_success \\\n \t'creating an annotated tag with -m message should succeed' '\n-\tgit-tag -m \"A message\" annotated-tag &&\n+\tgit tag -m \"A message\" annotated-tag &&\n \tget_tag_msg annotated-tag >actual &&\n@@ -315,3 +315,3 @@ test_expect_success \\\n \t'creating an annotated tag with -F messagefile should succeed' '\n-\tgit-tag -F msgfile file-annotated-tag &&\n+\tgit tag -F msgfile file-annotated-tag &&\n \tget_tag_msg file-annotated-tag >actual &&\n@@ -327,3 +327,3 @@ cat inputmsg >>expect\n test_expect_success 'creating an annotated tag with -F - should succeed' '\n-\tgit-tag -F - stdin-annotated-tag <inputmsg &&\n+\tgit tag -F - stdin-annotated-tag <inputmsg &&\n \tget_tag_msg stdin-annotated-tag >actual &&\n@@ -336,3 +336,3 @@ test_expect_success \\\n \t! tag_exists notag &&\n-\ttest_must_fail git-tag -F nonexistingfile notag &&\n+\ttest_must_fail git tag -F nonexistingfile notag &&\n \t! tag_exists notag\n@@ -345,7 +345,7 @@ test_expect_success \\\n \t! tag_exists msgtag &&\n-\ttest_must_fail git-tag -m \"message 1\" -F msgfile1 msgtag &&\n+\ttest_must_fail git tag -m \"message 1\" -F msgfile1 msgtag &&\n \t! tag_exists msgtag &&\n-\ttest_must_fail git-tag -F msgfile1 -m \"message 1\" msgtag &&\n+\ttest_must_fail git tag -F msgfile1 -m \"message 1\" msgtag &&\n \t! tag_exists msgtag &&\n-\ttest_must_fail git-tag -m \"message 1\" -F msgfile1 \\\n+\ttest_must_fail git tag -m \"message 1\" -F msgfile1 \\\n \t\t-m \"message 2\" msgtag &&\n@@ -359,3 +359,3 @@ test_expect_success \\\n \t'creating a tag with an empty -m message should succeed' '\n-\tgit-tag -m \"\" empty-annotated-tag &&\n+\tgit tag -m \"\" empty-annotated-tag &&\n \tget_tag_msg empty-annotated-tag >actual &&\n@@ -368,3 +368,3 @@ test_expect_success \\\n \t'creating a tag with an empty -F messagefile should succeed' '\n-\tgit-tag -F emptyfile emptyfile-annotated-tag &&\n+\tgit tag -F emptyfile emptyfile-annotated-tag &&\n \tget_tag_msg emptyfile-annotated-tag >actual &&\n@@ -389,3 +389,3 @@ test_expect_success \\\n \t'extra blanks in the message for an annotated tag should be removed' '\n-\tgit-tag -F blanksfile blanks-annotated-tag &&\n+\tgit tag -F blanksfile blanks-annotated-tag &&\n \tget_tag_msg blanks-annotated-tag >actual &&\n@@ -397,3 +397,3 @@ test_expect_success \\\n \t'creating a tag with blank -m message with spaces should succeed' '\n-\tgit-tag -m \"     \" blank-annotated-tag &&\n+\tgit tag -m \"     \" blank-annotated-tag &&\n \tget_tag_msg blank-annotated-tag >actual &&\n@@ -408,3 +408,3 @@ test_expect_success \\\n \t'creating a tag with blank -F messagefile with spaces should succeed' '\n-\tgit-tag -F blankfile blankfile-annotated-tag &&\n+\tgit tag -F blankfile blankfile-annotated-tag &&\n \tget_tag_msg blankfile-annotated-tag >actual &&\n@@ -417,3 +417,3 @@ test_expect_success \\\n \t'creating a tag with -F file of spaces and no newline should succeed' '\n-\tgit-tag -F blanknonlfile blanknonlfile-annotated-tag &&\n+\tgit tag -F blanknonlfile blanknonlfile-annotated-tag &&\n \tget_tag_msg blanknonlfile-annotated-tag >actual &&\n@@ -452,3 +452,3 @@ test_expect_success \\\n \t'creating a tag using a -F messagefile with #comments should succeed' '\n-\tgit-tag -F commentsfile comments-annotated-tag &&\n+\tgit tag -F commentsfile comments-annotated-tag &&\n \tget_tag_msg comments-annotated-tag >actual &&\n@@ -460,3 +460,3 @@ test_expect_success \\\n \t'creating a tag with a #comment in the -m message should succeed' '\n-\tgit-tag -m \"#comment\" comment-annotated-tag &&\n+\tgit tag -m \"#comment\" comment-annotated-tag &&\n \tget_tag_msg comment-annotated-tag >actual &&\n@@ -471,3 +471,3 @@ test_expect_success \\\n \t'creating a tag with #comments in the -F messagefile should succeed' '\n-\tgit-tag -F commentfile commentfile-annotated-tag &&\n+\tgit tag -F commentfile commentfile-annotated-tag &&\n \tget_tag_msg commentfile-annotated-tag >actual &&\n@@ -480,3 +480,3 @@ test_expect_success \\\n \t'creating a tag with a file of #comment and no newline should succeed' '\n-\tgit-tag -F commentnonlfile commentnonlfile-annotated-tag &&\n+\tgit tag -F commentnonlfile commentnonlfile-annotated-tag &&\n \tget_tag_msg commentnonlfile-annotated-tag >actual &&\n@@ -489,10 +489,10 @@ test_expect_success \\\n \t'listing the one-line message of a non-signed tag should succeed' '\n-\tgit-tag -m \"A msg\" tag-one-line &&\n+\tgit tag -m \"A msg\" tag-one-line &&\n \n \techo \"tag-one-line\" >expect &&\n-\tgit-tag -l | grep \"^tag-one-line\" >actual &&\n+\tgit tag -l | grep \"^tag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^tag-one-line\" >actual &&\n+\tgit tag -n0 -l | grep \"^tag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l tag-one-line >actual &&\n+\tgit tag -n0 -l tag-one-line >actual &&\n \ttest_cmp expect actual &&\n@@ -500,11 +500,11 @@ test_expect_success \\\n \techo \"tag-one-line    A msg\" >expect &&\n-\tgit-tag -n1 -l | grep \"^tag-one-line\" >actual &&\n+\tgit tag -n1 -l | grep \"^tag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^tag-one-line\" >actual &&\n+\tgit tag -n -l | grep \"^tag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l tag-one-line >actual &&\n+\tgit tag -n1 -l tag-one-line >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l tag-one-line >actual &&\n+\tgit tag -n2 -l tag-one-line >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n999 -l tag-one-line >actual &&\n+\tgit tag -n999 -l tag-one-line >actual &&\n \ttest_cmp expect actual\n@@ -514,10 +514,10 @@ test_expect_success \\\n \t'listing the zero-lines message of a non-signed tag should succeed' '\n-\tgit-tag -m \"\" tag-zero-lines &&\n+\tgit tag -m \"\" tag-zero-lines &&\n \n \techo \"tag-zero-lines\" >expect &&\n-\tgit-tag -l | grep \"^tag-zero-lines\" >actual &&\n+\tgit tag -l | grep \"^tag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^tag-zero-lines\" >actual &&\n+\tgit tag -n0 -l | grep \"^tag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l tag-zero-lines >actual &&\n+\tgit tag -n0 -l tag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -525,11 +525,11 @@ test_expect_success \\\n \techo \"tag-zero-lines  \" >expect &&\n-\tgit-tag -n1 -l | grep \"^tag-zero-lines\" >actual &&\n+\tgit tag -n1 -l | grep \"^tag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^tag-zero-lines\" >actual &&\n+\tgit tag -n -l | grep \"^tag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l tag-zero-lines >actual &&\n+\tgit tag -n1 -l tag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l tag-zero-lines >actual &&\n+\tgit tag -n2 -l tag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n999 -l tag-zero-lines >actual &&\n+\tgit tag -n999 -l tag-zero-lines >actual &&\n \ttest_cmp expect actual\n@@ -542,10 +542,10 @@ test_expect_success \\\n \t'listing many message lines of a non-signed tag should succeed' '\n-\tgit-tag -F annotagmsg tag-lines &&\n+\tgit tag -F annotagmsg tag-lines &&\n \n \techo \"tag-lines\" >expect &&\n-\tgit-tag -l | grep \"^tag-lines\" >actual &&\n+\tgit tag -l | grep \"^tag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^tag-lines\" >actual &&\n+\tgit tag -n0 -l | grep \"^tag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l tag-lines >actual &&\n+\tgit tag -n0 -l tag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -553,7 +553,7 @@ test_expect_success \\\n \techo \"tag-lines       tag line one\" >expect &&\n-\tgit-tag -n1 -l | grep \"^tag-lines\" >actual &&\n+\tgit tag -n1 -l | grep \"^tag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^tag-lines\" >actual &&\n+\tgit tag -n -l | grep \"^tag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l tag-lines >actual &&\n+\tgit tag -n1 -l tag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -561,5 +561,5 @@ test_expect_success \\\n \techo \"    tag line two\" >>expect &&\n-\tgit-tag -n2 -l | grep \"^ *tag.line\" >actual &&\n+\tgit tag -n2 -l | grep \"^ *tag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l tag-lines >actual &&\n+\tgit tag -n2 -l tag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -567,13 +567,13 @@ test_expect_success \\\n \techo \"    tag line three\" >>expect &&\n-\tgit-tag -n3 -l | grep \"^ *tag.line\" >actual &&\n+\tgit tag -n3 -l | grep \"^ *tag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n3 -l tag-lines >actual &&\n+\tgit tag -n3 -l tag-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n4 -l | grep \"^ *tag.line\" >actual &&\n+\tgit tag -n4 -l | grep \"^ *tag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n4 -l tag-lines >actual &&\n+\tgit tag -n4 -l tag-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n99 -l | grep \"^ *tag.line\" >actual &&\n+\tgit tag -n99 -l | grep \"^ *tag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n99 -l tag-lines >actual &&\n+\tgit tag -n99 -l tag-lines >actual &&\n \ttest_cmp expect actual\n@@ -594,3 +594,3 @@ test_expect_success \\\n \ttag_exists annotated-tag &&\n-\ttest_must_fail git-tag -v annotated-tag\n+\ttest_must_fail git tag -v annotated-tag\n '\n@@ -600,3 +600,3 @@ test_expect_success \\\n \ttag_exists file-annotated-tag &&\n-\ttest_must_fail git-tag -v file-annotated-tag\n+\ttest_must_fail git tag -v file-annotated-tag\n '\n@@ -606,3 +606,3 @@ test_expect_success \\\n \ttag_exists annotated-tag file-annotated-tag &&\n-\ttest_must_fail git-tag -v annotated-tag file-annotated-tag\n+\ttest_must_fail git tag -v annotated-tag file-annotated-tag\n '\n@@ -636,3 +636,3 @@ echo '-----BEGIN PGP SIGNATURE-----' >>expect\n test_expect_success 'creating a signed tag with -m message should succeed' '\n-\tgit-tag -s -m \"A signed tag message\" signed-tag &&\n+\tgit tag -s -m \"A signed tag message\" signed-tag &&\n \tget_tag_msg signed-tag >actual &&\n@@ -677,3 +677,3 @@ echo '-----BEGIN PGP SIGNATURE-----' >>expect\n test_expect_success '-u implies signed tag' '\n-\tGIT_EDITOR=./fakeeditor git-tag -u CDDE430D implied-sign &&\n+\tGIT_EDITOR=./fakeeditor git tag -u CDDE430D implied-sign &&\n \tget_tag_msg implied-sign >actual &&\n@@ -691,3 +691,3 @@ test_expect_success \\\n \t'creating a signed tag with -F messagefile should succeed' '\n-\tgit-tag -s -F sigmsgfile file-signed-tag &&\n+\tgit tag -s -F sigmsgfile file-signed-tag &&\n \tget_tag_msg file-signed-tag >actual &&\n@@ -704,3 +704,3 @@ echo '-----BEGIN PGP SIGNATURE-----' >>expect\n test_expect_success 'creating a signed tag with -F - should succeed' '\n-\tgit-tag -s -F - stdin-signed-tag <siginputmsg &&\n+\tgit tag -s -F - stdin-signed-tag <siginputmsg &&\n \tget_tag_msg stdin-signed-tag >actual &&\n@@ -713,3 +713,3 @@ echo '-----BEGIN PGP SIGNATURE-----' >>expect\n test_expect_success '-s implies annotated tag' '\n-\tGIT_EDITOR=./fakeeditor git-tag -s implied-annotate &&\n+\tGIT_EDITOR=./fakeeditor git tag -s implied-annotate &&\n \tget_tag_msg implied-annotate >actual &&\n@@ -722,3 +722,3 @@ test_expect_success \\\n \t! tag_exists nosigtag &&\n-\ttest_must_fail git-tag -s -F nonexistingfile nosigtag &&\n+\ttest_must_fail git tag -s -F nonexistingfile nosigtag &&\n \t! tag_exists nosigtag\n@@ -727,6 +727,6 @@ test_expect_success \\\n test_expect_success 'verifying a signed tag should succeed' \\\n-\t'git-tag -v signed-tag'\n+\t'git tag -v signed-tag'\n \n test_expect_success 'verifying two signed tags in one command should succeed' \\\n-\t'git-tag -v signed-tag file-signed-tag'\n+\t'git tag -v signed-tag file-signed-tag'\n \n@@ -734,7 +734,7 @@ test_expect_success \\\n \t'verifying many signed and non-signed tags should fail' '\n-\ttest_must_fail git-tag -v signed-tag annotated-tag &&\n-\ttest_must_fail git-tag -v file-annotated-tag file-signed-tag &&\n-\ttest_must_fail git-tag -v annotated-tag \\\n+\ttest_must_fail git tag -v signed-tag annotated-tag &&\n+\ttest_must_fail git tag -v file-annotated-tag file-signed-tag &&\n+\ttest_must_fail git tag -v annotated-tag \\\n \t\tfile-signed-tag file-annotated-tag &&\n-\ttest_must_fail git-tag -v signed-tag annotated-tag file-signed-tag\n+\ttest_must_fail git tag -v signed-tag annotated-tag file-signed-tag\n '\n@@ -746,3 +746,3 @@ test_expect_success 'verifying a forged tag should fail' '\n \tgit tag forged-tag $forged &&\n-\ttest_must_fail git-tag -v forged-tag\n+\ttest_must_fail git tag -v forged-tag\n '\n@@ -755,6 +755,6 @@ test_expect_success \\\n \t'creating a signed tag with an empty -m message should succeed' '\n-\tgit-tag -s -m \"\" empty-signed-tag &&\n+\tgit tag -s -m \"\" empty-signed-tag &&\n \tget_tag_msg empty-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v empty-signed-tag\n+\tgit tag -v empty-signed-tag\n '\n@@ -766,6 +766,6 @@ test_expect_success \\\n \t'creating a signed tag with an empty -F messagefile should succeed' '\n-\tgit-tag -s -F sigemptyfile emptyfile-signed-tag &&\n+\tgit tag -s -F sigemptyfile emptyfile-signed-tag &&\n \tget_tag_msg emptyfile-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v emptyfile-signed-tag\n+\tgit tag -v emptyfile-signed-tag\n '\n@@ -789,6 +789,6 @@ test_expect_success \\\n \t'extra blanks in the message for a signed tag should be removed' '\n-\tgit-tag -s -F sigblanksfile blanks-signed-tag &&\n+\tgit tag -s -F sigblanksfile blanks-signed-tag &&\n \tget_tag_msg blanks-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v blanks-signed-tag\n+\tgit tag -v blanks-signed-tag\n '\n@@ -799,6 +799,6 @@ test_expect_success \\\n \t'creating a signed tag with a blank -m message should succeed' '\n-\tgit-tag -s -m \"     \" blank-signed-tag &&\n+\tgit tag -s -m \"     \" blank-signed-tag &&\n \tget_tag_msg blank-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v blank-signed-tag\n+\tgit tag -v blank-signed-tag\n '\n@@ -812,6 +812,6 @@ test_expect_success \\\n \t'creating a signed tag with blank -F file with spaces should succeed' '\n-\tgit-tag -s -F sigblankfile blankfile-signed-tag &&\n+\tgit tag -s -F sigblankfile blankfile-signed-tag &&\n \tget_tag_msg blankfile-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v blankfile-signed-tag\n+\tgit tag -v blankfile-signed-tag\n '\n@@ -823,6 +823,6 @@ test_expect_success \\\n \t'creating a signed tag with spaces and no newline should succeed' '\n-\tgit-tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&\n+\tgit tag -s -F sigblanknonlfile blanknonlfile-signed-tag &&\n \tget_tag_msg blanknonlfile-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v signed-tag\n+\tgit tag -v signed-tag\n '\n@@ -860,6 +860,6 @@ test_expect_success \\\n \t'creating a signed tag with a -F file with #comments should succeed' '\n-\tgit-tag -s -F sigcommentsfile comments-signed-tag &&\n+\tgit tag -s -F sigcommentsfile comments-signed-tag &&\n \tget_tag_msg comments-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v comments-signed-tag\n+\tgit tag -v comments-signed-tag\n '\n@@ -870,6 +870,6 @@ test_expect_success \\\n \t'creating a signed tag with #commented -m message should succeed' '\n-\tgit-tag -s -m \"#comment\" comment-signed-tag &&\n+\tgit tag -s -m \"#comment\" comment-signed-tag &&\n \tget_tag_msg comment-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v comment-signed-tag\n+\tgit tag -v comment-signed-tag\n '\n@@ -883,6 +883,6 @@ test_expect_success \\\n \t'creating a signed tag with #commented -F messagefile should succeed' '\n-\tgit-tag -s -F sigcommentfile commentfile-signed-tag &&\n+\tgit tag -s -F sigcommentfile commentfile-signed-tag &&\n \tget_tag_msg commentfile-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v commentfile-signed-tag\n+\tgit tag -v commentfile-signed-tag\n '\n@@ -894,6 +894,6 @@ test_expect_success \\\n \t'creating a signed tag with a #comment and no newline should succeed' '\n-\tgit-tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&\n+\tgit tag -s -F sigcommentnonlfile commentnonlfile-signed-tag &&\n \tget_tag_msg commentnonlfile-signed-tag >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -v commentnonlfile-signed-tag\n+\tgit tag -v commentnonlfile-signed-tag\n '\n@@ -904,10 +904,10 @@ test_expect_success \\\n \t'listing the one-line message of a signed tag should succeed' '\n-\tgit-tag -s -m \"A message line signed\" stag-one-line &&\n+\tgit tag -s -m \"A message line signed\" stag-one-line &&\n \n \techo \"stag-one-line\" >expect &&\n-\tgit-tag -l | grep \"^stag-one-line\" >actual &&\n+\tgit tag -l | grep \"^stag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^stag-one-line\" >actual &&\n+\tgit tag -n0 -l | grep \"^stag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l stag-one-line >actual &&\n+\tgit tag -n0 -l stag-one-line >actual &&\n \ttest_cmp expect actual &&\n@@ -915,11 +915,11 @@ test_expect_success \\\n \techo \"stag-one-line   A message line signed\" >expect &&\n-\tgit-tag -n1 -l | grep \"^stag-one-line\" >actual &&\n+\tgit tag -n1 -l | grep \"^stag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^stag-one-line\" >actual &&\n+\tgit tag -n -l | grep \"^stag-one-line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l stag-one-line >actual &&\n+\tgit tag -n1 -l stag-one-line >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l stag-one-line >actual &&\n+\tgit tag -n2 -l stag-one-line >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n999 -l stag-one-line >actual &&\n+\tgit tag -n999 -l stag-one-line >actual &&\n \ttest_cmp expect actual\n@@ -929,10 +929,10 @@ test_expect_success \\\n \t'listing the zero-lines message of a signed tag should succeed' '\n-\tgit-tag -s -m \"\" stag-zero-lines &&\n+\tgit tag -s -m \"\" stag-zero-lines &&\n \n \techo \"stag-zero-lines\" >expect &&\n-\tgit-tag -l | grep \"^stag-zero-lines\" >actual &&\n+\tgit tag -l | grep \"^stag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^stag-zero-lines\" >actual &&\n+\tgit tag -n0 -l | grep \"^stag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l stag-zero-lines >actual &&\n+\tgit tag -n0 -l stag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -940,11 +940,11 @@ test_expect_success \\\n \techo \"stag-zero-lines \" >expect &&\n-\tgit-tag -n1 -l | grep \"^stag-zero-lines\" >actual &&\n+\tgit tag -n1 -l | grep \"^stag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^stag-zero-lines\" >actual &&\n+\tgit tag -n -l | grep \"^stag-zero-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l stag-zero-lines >actual &&\n+\tgit tag -n1 -l stag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l stag-zero-lines >actual &&\n+\tgit tag -n2 -l stag-zero-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n999 -l stag-zero-lines >actual &&\n+\tgit tag -n999 -l stag-zero-lines >actual &&\n \ttest_cmp expect actual\n@@ -957,10 +957,10 @@ test_expect_success \\\n \t'listing many message lines of a signed tag should succeed' '\n-\tgit-tag -s -F sigtagmsg stag-lines &&\n+\tgit tag -s -F sigtagmsg stag-lines &&\n \n \techo \"stag-lines\" >expect &&\n-\tgit-tag -l | grep \"^stag-lines\" >actual &&\n+\tgit tag -l | grep \"^stag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l | grep \"^stag-lines\" >actual &&\n+\tgit tag -n0 -l | grep \"^stag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n0 -l stag-lines >actual &&\n+\tgit tag -n0 -l stag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -968,7 +968,7 @@ test_expect_success \\\n \techo \"stag-lines      stag line one\" >expect &&\n-\tgit-tag -n1 -l | grep \"^stag-lines\" >actual &&\n+\tgit tag -n1 -l | grep \"^stag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n -l | grep \"^stag-lines\" >actual &&\n+\tgit tag -n -l | grep \"^stag-lines\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n1 -l stag-lines >actual &&\n+\tgit tag -n1 -l stag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -976,5 +976,5 @@ test_expect_success \\\n \techo \"    stag line two\" >>expect &&\n-\tgit-tag -n2 -l | grep \"^ *stag.line\" >actual &&\n+\tgit tag -n2 -l | grep \"^ *stag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n2 -l stag-lines >actual &&\n+\tgit tag -n2 -l stag-lines >actual &&\n \ttest_cmp expect actual &&\n@@ -982,13 +982,13 @@ test_expect_success \\\n \techo \"    stag line three\" >>expect &&\n-\tgit-tag -n3 -l | grep \"^ *stag.line\" >actual &&\n+\tgit tag -n3 -l | grep \"^ *stag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n3 -l stag-lines >actual &&\n+\tgit tag -n3 -l stag-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n4 -l | grep \"^ *stag.line\" >actual &&\n+\tgit tag -n4 -l | grep \"^ *stag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n4 -l stag-lines >actual &&\n+\tgit tag -n4 -l stag-lines >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n99 -l | grep \"^ *stag.line\" >actual &&\n+\tgit tag -n99 -l | grep \"^ *stag.line\" >actual &&\n \ttest_cmp expect actual &&\n-\tgit-tag -n99 -l stag-lines >actual &&\n+\tgit tag -n99 -l stag-lines >actual &&\n \ttest_cmp expect actual\n@@ -1007,3 +1007,3 @@ test_expect_success \\\n \t'creating a signed tag pointing to a tree should succeed' '\n-\tgit-tag -s -m \"A message for a tree\" tree-signed-tag HEAD^{tree} &&\n+\tgit tag -s -m \"A message for a tree\" tree-signed-tag HEAD^{tree} &&\n \tget_tag_msg tree-signed-tag >actual &&\n@@ -1017,3 +1017,3 @@ test_expect_success \\\n \t'creating a signed tag pointing to a blob should succeed' '\n-\tgit-tag -s -m \"A message for a blob\" blob-signed-tag HEAD:foo &&\n+\tgit tag -s -m \"A message for a blob\" blob-signed-tag HEAD:foo &&\n \tget_tag_msg blob-signed-tag >actual &&\n@@ -1027,3 +1027,3 @@ test_expect_success \\\n \t'creating a signed tag pointing to another tag should succeed' '\n-\tgit-tag -s -m \"A message for another tag\" tag-signed-tag signed-tag &&\n+\tgit tag -s -m \"A message for another tag\" tag-signed-tag signed-tag &&\n \tget_tag_msg tag-signed-tag >actual &&\n@@ -1035,3 +1035,3 @@ git config user.signingkey BobTheMouse\n test_expect_success \\\n-\t'git-tag -s fails if gpg is misconfigured' \\\n+\t'git tag -s fails if gpg is misconfigured' \\\n \t'test_must_fail git tag -s -m tail tag-gpg-failure'\n@@ -1044,6 +1044,6 @@ test_expect_success \\\n \t'verify signed tag fails when public key is not present' \\\n-\t'test_must_fail git-tag -v signed-tag'\n+\t'test_must_fail git tag -v signed-tag'\n \n test_expect_success \\\n-\t'git-tag -a fails if tag annotation is empty' '\n+\t'git tag -a fails if tag annotation is empty' '\n \t! (GIT_EDITOR=cat git tag -a initial-comment)\ndiff --git a/t/t7101-reset.sh b/t/t7101-reset.sh\nindex ffaeb39..96e163f 100755\n--- a/t/t7101-reset.sh\n+++ b/t/t7101-reset.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-reset should cull empty subdirs'\n+test_description='git reset should cull empty subdirs'\n . ./test-lib.sh\n@@ -13,3 +13,3 @@ test_expect_success \\\n      git add path0/COPYING &&\n-     git-commit -m add -a'\n+     git commit -m add -a'\n \n@@ -27,3 +27,3 @@ test_expect_success \\\n      git add path0/COPYING-TOO &&\n-     git-commit -m change -a'\n+     git commit -m change -a'\n \n@@ -31,3 +31,3 @@ test_expect_success \\\n     'resetting tree HEAD^' \\\n-    'git-reset --hard HEAD^'\n+    'git reset --hard HEAD^'\n \ndiff --git a/t/t7102-reset.sh b/t/t7102-reset.sh\nindex 29f5678..e637c7d 100755\n--- a/t/t7102-reset.sh\n+++ b/t/t7102-reset.sh\n@@ -5,5 +5,5 @@\n \n-test_description='git-reset\n+test_description='git reset\n \n-Documented tests for git-reset'\n+Documented tests for git reset'\n \ndiff --git a/t/t7103-reset-bare.sh b/t/t7103-reset-bare.sh\nindex cdecebe..42bf518 100755\n--- a/t/t7103-reset-bare.sh\n+++ b/t/t7103-reset-bare.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-reset in a bare repository'\n+test_description='git reset in a bare repository'\n . ./test-lib.sh\n-- \n1.6.0.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"}]}