{"thread":{"id":"15349","subject":"[PATCH 4/4] tests: use \"git xyzzy\" form (t7200 - t9001)","startedAt":"2008-09-03T08:59:33Z","lastAt":"2008-09-03T08:59:33Z","messageCount":1,"participants":["Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"89601","messageId":"20080903175933.6117@nanako3.lavabit.com","threadId":"15349","inReplyTo":null,"subject":"[PATCH 4/4] tests: use \"git xyzzy\" form (t7200 - t9001)","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-03T08:59:33Z","receivedAt":"2008-09-03T08:59:33Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Converts tests between t7201-t9001.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t7201-co.sh                        |    2 +-\n t/t7300-clean.sh                     |   72 +++++++++++++++++-----------------\n t/t7400-submodule-basic.sh           |   48 +++++++++++-----------\n t/t7401-submodule-summary.sh         |    2 +-\n t/t7500-commit.sh                    |    2 +-\n t/t7501-commit.sh                    |   48 +++++++++++-----------\n t/t7502-status.sh                    |    2 +-\n t/t7505-prepare-commit-msg-hook.sh   |    2 +-\n t/t7506-status-submodule.sh          |    2 +-\n t/t7600-merge.sh                     |    2 +-\n t/t7601-merge-pull-config.sh         |    2 +-\n t/t7602-merge-octopus-many.sh        |    2 +-\n t/t7603-merge-reduce-heads.sh        |    2 +-\n t/t7604-merge-custom-message.sh      |    2 +-\n t/t7605-merge-resolve.sh             |    2 +-\n t/t7610-mergetool.sh                 |    2 +-\n t/t7701-repack-unpack-unreachable.sh |    2 +-\n t/t9001-send-email.sh                |    2 +-\n 18 files changed, 99 insertions(+), 99 deletions(-)\n\ndiff --git a/t/t7201-co.sh b/t/t7201-co.sh\nindex 1dff84d..543b1c2 100755\n--- a/t/t7201-co.sh\n+++ b/t/t7201-co.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-checkout tests.\n+test_description='git checkout tests.\n \ndiff --git a/t/t7300-clean.sh b/t/t7300-clean.sh\nindex 2b51c0d..1636fac 100755\n--- a/t/t7300-clean.sh\n+++ b/t/t7300-clean.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-clean basic tests'\n+test_description='git clean basic tests'\n \n@@ -18,3 +18,3 @@ test_expect_success 'setup' '\n \tgit add . &&\n-\tgit-commit -m setup &&\n+\tgit commit -m setup &&\n \ttouch src/part2.c README &&\n@@ -24,3 +24,3 @@ test_expect_success 'setup' '\n \n-test_expect_success 'git-clean' '\n+test_expect_success 'git clean' '\n \n@@ -28,3 +28,3 @@ test_expect_success 'git-clean' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean &&\n+\tgit clean &&\n \ttest -f Makefile &&\n@@ -41,3 +41,3 @@ test_expect_success 'git-clean' '\n \n-test_expect_success 'git-clean src/' '\n+test_expect_success 'git clean src/' '\n \n@@ -45,3 +45,3 @@ test_expect_success 'git-clean src/' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean src/ &&\n+\tgit clean src/ &&\n \ttest -f Makefile &&\n@@ -58,3 +58,3 @@ test_expect_success 'git-clean src/' '\n \n-test_expect_success 'git-clean src/ src/' '\n+test_expect_success 'git clean src/ src/' '\n \n@@ -62,3 +62,3 @@ test_expect_success 'git-clean src/ src/' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean src/ src/ &&\n+\tgit clean src/ src/ &&\n \ttest -f Makefile &&\n@@ -75,3 +75,3 @@ test_expect_success 'git-clean src/ src/' '\n \n-test_expect_success 'git-clean with prefix' '\n+test_expect_success 'git clean with prefix' '\n \n@@ -79,3 +79,3 @@ test_expect_success 'git-clean with prefix' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&\n-\t(cd src/ && git-clean) &&\n+\t(cd src/ && git clean) &&\n \ttest -f Makefile &&\n@@ -93,3 +93,3 @@ test_expect_success 'git-clean with prefix' '\n \n-test_expect_success 'git-clean with relative prefix' '\n+test_expect_success 'git clean with relative prefix' '\n \n@@ -108,3 +108,3 @@ test_expect_success 'git-clean with relative prefix' '\n \n-test_expect_success 'git-clean with absolute path' '\n+test_expect_success 'git clean with absolute path' '\n \n@@ -123,3 +123,3 @@ test_expect_success 'git-clean with absolute path' '\n \n-test_expect_success 'git-clean with out of work tree relative path' '\n+test_expect_success 'git clean with out of work tree relative path' '\n \n@@ -133,3 +133,3 @@ test_expect_success 'git-clean with out of work tree relative path' '\n \n-test_expect_success 'git-clean with out of work tree absolute path' '\n+test_expect_success 'git clean with out of work tree absolute path' '\n \n@@ -144,3 +144,3 @@ test_expect_success 'git-clean with out of work tree absolute path' '\n \n-test_expect_success 'git-clean -d with prefix and path' '\n+test_expect_success 'git clean -d with prefix and path' '\n \n@@ -148,3 +148,3 @@ test_expect_success 'git-clean -d with prefix and path' '\n \ttouch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&\n-\t(cd src/ && git-clean -d feature/) &&\n+\t(cd src/ && git clean -d feature/) &&\n \ttest -f Makefile &&\n@@ -162,3 +162,3 @@ test_expect_success 'git-clean -d with prefix and path' '\n \n-test_expect_success 'git-clean symbolic link' '\n+test_expect_success 'git clean symbolic link' '\n \n@@ -167,3 +167,3 @@ test_expect_success 'git-clean symbolic link' '\n \tln -s docs/manual.txt src/part4.c\n-\tgit-clean &&\n+\tgit clean &&\n \ttest -f Makefile &&\n@@ -181,6 +181,6 @@ test_expect_success 'git-clean symbolic link' '\n \n-test_expect_success 'git-clean with wildcard' '\n+test_expect_success 'git clean with wildcard' '\n \n \ttouch a.clean b.clean other.c &&\n-\tgit-clean \"*.clean\" &&\n+\tgit clean \"*.clean\" &&\n \ttest -f Makefile &&\n@@ -195,3 +195,3 @@ test_expect_success 'git-clean with wildcard' '\n \n-test_expect_success 'git-clean -n' '\n+test_expect_success 'git clean -n' '\n \n@@ -199,3 +199,3 @@ test_expect_success 'git-clean -n' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -n &&\n+\tgit clean -n &&\n \ttest -f Makefile &&\n@@ -212,3 +212,3 @@ test_expect_success 'git-clean -n' '\n \n-test_expect_success 'git-clean -d' '\n+test_expect_success 'git clean -d' '\n \n@@ -216,3 +216,3 @@ test_expect_success 'git-clean -d' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -d &&\n+\tgit clean -d &&\n \ttest -f Makefile &&\n@@ -229,3 +229,3 @@ test_expect_success 'git-clean -d' '\n \n-test_expect_success 'git-clean -d src/ examples/' '\n+test_expect_success 'git clean -d src/ examples/' '\n \n@@ -233,3 +233,3 @@ test_expect_success 'git-clean -d src/ examples/' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&\n-\tgit-clean -d src/ examples/ &&\n+\tgit clean -d src/ examples/ &&\n \ttest -f Makefile &&\n@@ -247,3 +247,3 @@ test_expect_success 'git-clean -d src/ examples/' '\n \n-test_expect_success 'git-clean -x' '\n+test_expect_success 'git clean -x' '\n \n@@ -251,3 +251,3 @@ test_expect_success 'git-clean -x' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -x &&\n+\tgit clean -x &&\n \ttest -f Makefile &&\n@@ -264,3 +264,3 @@ test_expect_success 'git-clean -x' '\n \n-test_expect_success 'git-clean -d -x' '\n+test_expect_success 'git clean -d -x' '\n \n@@ -268,3 +268,3 @@ test_expect_success 'git-clean -d -x' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -d -x &&\n+\tgit clean -d -x &&\n \ttest -f Makefile &&\n@@ -281,3 +281,3 @@ test_expect_success 'git-clean -d -x' '\n \n-test_expect_success 'git-clean -X' '\n+test_expect_success 'git clean -X' '\n \n@@ -285,3 +285,3 @@ test_expect_success 'git-clean -X' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -X &&\n+\tgit clean -X &&\n \ttest -f Makefile &&\n@@ -298,3 +298,3 @@ test_expect_success 'git-clean -X' '\n \n-test_expect_success 'git-clean -d -X' '\n+test_expect_success 'git clean -d -X' '\n \n@@ -302,3 +302,3 @@ test_expect_success 'git-clean -d -X' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -d -X &&\n+\tgit clean -d -X &&\n \ttest -f Makefile &&\n@@ -333,3 +333,3 @@ test_expect_success 'clean.requireForce and -n' '\n \ttouch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&\n-\tgit-clean -n &&\n+\tgit clean -n &&\n \ttest -f Makefile &&\n@@ -348,3 +348,3 @@ test_expect_success 'clean.requireForce and -f' '\n \n-\tgit-clean -f &&\n+\tgit clean -f &&\n \ttest -f README &&\ndiff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh\nindex cbc0c34..be73f7b 100755\n--- a/t/t7400-submodule-basic.sh\n+++ b/t/t7400-submodule-basic.sh\n@@ -8,3 +8,3 @@ test_description='Basic porcelain support for submodules\n This test tries to verify basic sanity of the init, update and status\n-subcommands of git-submodule.\n+subcommands of git submodule.\n '\n@@ -24,4 +24,4 @@ test_expect_success 'Prepare submodule testing' '\n \t: > t &&\n-\tgit-add t &&\n-\tgit-commit -m \"initial commit\" &&\n+\tgit add t &&\n+\tgit commit -m \"initial commit\" &&\n \tgit branch initial HEAD &&\n@@ -32,4 +32,4 @@ test_expect_success 'Prepare submodule testing' '\n \tgit add a &&\n-\tgit-commit -m \"submodule commit 1\" &&\n-\tgit-tag -a -m \"rev-1\" rev-1 &&\n+\tgit commit -m \"submodule commit 1\" &&\n+\tgit tag -a -m \"rev-1\" rev-1 &&\n \trev1=$(git rev-parse HEAD) &&\n@@ -44,3 +44,3 @@ test_expect_success 'Prepare submodule testing' '\n \tgit add a init z &&\n-\tgit-commit -m \"super commit 1\" &&\n+\tgit commit -m \"super commit 1\" &&\n \tmv init .subrepo &&\n@@ -50,3 +50,3 @@ test_expect_success 'Prepare submodule testing' '\n test_expect_success 'status should fail for unmapped paths' '\n-\tif git-submodule status\n+\tif git submodule status\n \tthen\n@@ -62,3 +62,3 @@ test_expect_success 'status should fail for unmapped paths' '\n test_expect_success 'status should only print one line' '\n-\tlines=$(git-submodule status | wc -l) &&\n+\tlines=$(git submodule status | wc -l) &&\n \ttest $lines = 1\n@@ -67,3 +67,3 @@ test_expect_success 'status should only print one line' '\n test_expect_success 'status should initially be \"missing\"' '\n-\tgit-submodule status | grep \"^-$rev1\"\n+\tgit submodule status | grep \"^-$rev1\"\n '\n@@ -71,3 +71,3 @@ test_expect_success 'status should initially be \"missing\"' '\n test_expect_success 'init should register submodule url in .git/config' '\n-\tgit-submodule init &&\n+\tgit submodule init &&\n \turl=$(git config submodule.example.url) &&\n@@ -86,3 +86,3 @@ test_expect_success 'update should fail when path is used by a file' '\n \techo \"hello\" >init &&\n-\tif git-submodule update\n+\tif git submodule update\n \tthen\n@@ -102,3 +102,3 @@ test_expect_success 'update should fail when path is used by a nonempty director\n \techo \"hello\" >init/a &&\n-\tif git-submodule update\n+\tif git submodule update\n \tthen\n@@ -118,3 +118,3 @@ test_expect_success 'update should work when path is an empty dir' '\n \tmkdir init &&\n-\tgit-submodule update &&\n+\tgit submodule update &&\n \thead=$(cd init && git rev-parse HEAD) &&\n@@ -132,3 +132,3 @@ test_expect_success 'update should work when path is an empty dir' '\n test_expect_success 'status should be \"up-to-date\" after update' '\n-\tgit-submodule status | grep \"^ $rev1\"\n+\tgit submodule status | grep \"^ $rev1\"\n '\n@@ -139,3 +139,3 @@ test_expect_success 'status should be \"modified\" after submodule commit' '\n \tgit add b &&\n-\tgit-commit -m \"submodule commit 2\" &&\n+\tgit commit -m \"submodule commit 2\" &&\n \trev2=$(git rev-parse HEAD) &&\n@@ -147,3 +147,3 @@ test_expect_success 'status should be \"modified\" after submodule commit' '\n \tfi &&\n-\tgit-submodule status | grep \"^+$rev2\"\n+\tgit submodule status | grep \"^+$rev2\"\n '\n@@ -151,3 +151,3 @@ test_expect_success 'status should be \"modified\" after submodule commit' '\n test_expect_success 'the --cached sha1 should be rev1' '\n-\tgit-submodule --cached status | grep \"^+$rev1\"\n+\tgit submodule --cached status | grep \"^+$rev1\"\n '\n@@ -155,3 +155,3 @@ test_expect_success 'the --cached sha1 should be rev1' '\n test_expect_success 'git diff should report the SHA1 of the new submodule commit' '\n-\tgit-diff | grep \"^+Subproject commit $rev2\"\n+\tgit diff | grep \"^+Subproject commit $rev2\"\n '\n@@ -159,3 +159,3 @@ test_expect_success 'git diff should report the SHA1 of the new submodule commit\n test_expect_success 'update should checkout rev1' '\n-\tgit-submodule update init &&\n+\tgit submodule update init &&\n \thead=$(cd init && git rev-parse HEAD) &&\n@@ -173,3 +173,3 @@ test_expect_success 'update should checkout rev1' '\n test_expect_success 'status should be \"up-to-date\" after update' '\n-\tgit-submodule status | grep \"^ $rev1\"\n+\tgit submodule status | grep \"^ $rev1\"\n '\n@@ -177,4 +177,4 @@ test_expect_success 'status should be \"up-to-date\" after update' '\n test_expect_success 'checkout superproject with subproject already present' '\n-\tgit-checkout initial &&\n-\tgit-checkout master\n+\tgit checkout initial &&\n+\tgit checkout master\n '\n@@ -190,4 +190,4 @@ test_expect_success 'apply submodule diff' '\n \tgit update-index --add init &&\n-\tgit-commit -m \"change init\" &&\n-\tgit-format-patch -1 --stdout >P.diff &&\n+\tgit commit -m \"change init\" &&\n+\tgit format-patch -1 --stdout >P.diff &&\n \tgit checkout second &&\ndiff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh\nindex bf12dbd..6149829 100755\n--- a/t/t7401-submodule-summary.sh\n+++ b/t/t7401-submodule-summary.sh\n@@ -7,3 +7,3 @@ test_description='Summary support for submodules\n \n-This test tries to verify the sanity of summary subcommand of git-submodule.\n+This test tries to verify the sanity of summary subcommand of git submodule.\n '\ndiff --git a/t/t7500-commit.sh b/t/t7500-commit.sh\nindex 7ae0bd0..6e18a96 100755\n--- a/t/t7500-commit.sh\n+++ b/t/t7500-commit.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-commit\n+test_description='git commit\n \ndiff --git a/t/t7501-commit.sh b/t/t7501-commit.sh\nindex 0edd9dd..469bff8 100755\n--- a/t/t7501-commit.sh\n+++ b/t/t7501-commit.sh\n@@ -8,3 +8,3 @@\n \n-test_description='git-commit'\n+test_description='git commit'\n . ./test-lib.sh\n@@ -16,4 +16,4 @@ test_expect_success \\\n \t\"echo 'bongo bongo' >file &&\n-\t git-add file && \\\n-\t git-status | grep 'Initial commit'\"\n+\t git add file && \\\n+\t git status | grep 'Initial commit'\"\n \n@@ -21,3 +21,3 @@ test_expect_success \\\n \t\"fail initial amend\" \\\n-\t\"test_must_fail git-commit --amend\"\n+\t\"test_must_fail git commit --amend\"\n \n@@ -25,3 +25,3 @@ test_expect_success \\\n \t\"initial commit\" \\\n-\t\"git-commit -m initial\"\n+\t\"git commit -m initial\"\n \n@@ -29,3 +29,3 @@ test_expect_success \\\n \t\"invalid options 1\" \\\n-\t\"test_must_fail git-commit -m foo -m bar -F file\"\n+\t\"test_must_fail git commit -m foo -m bar -F file\"\n \n@@ -33,3 +33,3 @@ test_expect_success \\\n \t\"invalid options 2\" \\\n-\t\"test_must_fail git-commit -C HEAD -m illegal\"\n+\t\"test_must_fail git commit -C HEAD -m illegal\"\n \n@@ -38,3 +38,3 @@ test_expect_success \\\n \t\"echo King of the bongo >file &&\n-\ttest_must_fail git-commit -m foo -a file\"\n+\ttest_must_fail git commit -m foo -a file\"\n \n@@ -43,3 +43,3 @@ test_expect_success \\\n \t\"echo bong-o-bong >file &&\n-\t! (echo 7 | git-commit -m foo --interactive file)\"\n+\t! (echo 7 | git commit -m foo --interactive file)\"\n \n@@ -47,3 +47,3 @@ test_expect_success \\\n \t\"using invalid commit with -C\" \\\n-\t\"test_must_fail git-commit -C bogus\"\n+\t\"test_must_fail git commit -C bogus\"\n \n@@ -51,3 +51,3 @@ test_expect_success \\\n \t\"testing nothing to commit\" \\\n-\t\"test_must_fail git-commit -m initial\"\n+\t\"test_must_fail git commit -m initial\"\n \n@@ -56,3 +56,3 @@ test_expect_success \\\n \t\"echo 'bongo bongo bongo' >file \\\n-\t git-commit -m next -a\"\n+\t git commit -m next -a\"\n \n@@ -61,3 +61,3 @@ test_expect_success \\\n \t\"echo 'more bongo: bongo bongo bongo bongo' >file && \\\n-\t test_must_fail git-commit -F gah -a\"\n+\t test_must_fail git commit -F gah -a\"\n \n@@ -72,3 +72,3 @@ test_expect_success \\\n \t\"empty commit message\" \\\n-\t\"test_must_fail git-commit -F msg -a\"\n+\t\"test_must_fail git commit -F msg -a\"\n \n@@ -77,3 +77,3 @@ test_expect_success \\\n \t\"echo 'this is the commit message, coming from a file' >msg && \\\n-\t git-commit -F msg -a\"\n+\t git commit -F msg -a\"\n \n@@ -88,3 +88,3 @@ test_expect_success \\\n \t\"amend commit\" \\\n-\t\"VISUAL=./editor git-commit --amend\"\n+\t\"VISUAL=./editor git commit --amend\"\n \n@@ -93,3 +93,3 @@ test_expect_success \\\n \t\"echo 'enough with the bongos' >file && \\\n-\t test_must_fail git-commit -F msg -m amending .\"\n+\t test_must_fail git commit -F msg -m amending .\"\n \n@@ -97,3 +97,3 @@ test_expect_success \\\n \t\"using message from other commit\" \\\n-\t\"git-commit -C HEAD^ .\"\n+\t\"git commit -C HEAD^ .\"\n \n@@ -109,3 +109,3 @@ test_expect_success \\\n \t\"echo 'hula hula' >file && \\\n-\t VISUAL=./editor git-commit -c HEAD^ -a\"\n+\t VISUAL=./editor git commit -c HEAD^ -a\"\n \n@@ -114,3 +114,3 @@ test_expect_success \\\n \t\"echo 'silly new contents' >file && \\\n-\t echo commit message from stdin | git-commit -F - -a\"\n+\t echo commit message from stdin | git commit -F - -a\"\n \n@@ -119,3 +119,3 @@ test_expect_success \\\n \t\"echo 'gak' >file && \\\n-\t git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a\"\n+\t git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a\"\n \n@@ -123,3 +123,3 @@ test_expect_success \\\n \t\"interactive add\" \\\n-\t\"echo 7 | git-commit --interactive | grep 'What now'\"\n+\t\"echo 7 | git commit --interactive | grep 'What now'\"\n \n@@ -127,3 +127,3 @@ test_expect_success \\\n \t\"showing committed revisions\" \\\n-\t\"git-rev-list HEAD >current\"\n+\t\"git rev-list HEAD >current\"\n \n@@ -142,3 +142,3 @@ EOF\n test_expect_success \\\n-    'validate git-rev-list output.' \\\n+    'validate git rev-list output.' \\\n     'diff current expected'\ndiff --git a/t/t7502-status.sh b/t/t7502-status.sh\nindex 38a48b5..c8e4c2e 100755\n--- a/t/t7502-status.sh\n+++ b/t/t7502-status.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-status'\n+test_description='git status'\n \ndiff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh\nindex cd6c7c8..ff18962 100755\n--- a/t/t7505-prepare-commit-msg-hook.sh\n+++ b/t/t7505-prepare-commit-msg-hook.sh\n@@ -34,3 +34,3 @@ cat >> \"$HOOK\" <<'EOF'\n if test \"$2\" = commit; then\n-  source=$(git-rev-parse \"$3\")\n+  source=$(git rev-parse \"$3\")\n else\ndiff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh\nindex a75130c..d9a08aa 100755\n--- a/t/t7506-status-submodule.sh\n+++ b/t/t7506-status-submodule.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-status for submodule'\n+test_description='git status for submodule'\n \ndiff --git a/t/t7600-merge.sh b/t/t7600-merge.sh\nindex 6a2b125..9516f54 100755\n--- a/t/t7600-merge.sh\n+++ b/t/t7600-merge.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh\nindex 55aa6b5..7ba94ea 100755\n--- a/t/t7601-merge-pull-config.sh\n+++ b/t/t7601-merge-pull-config.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh\nindex fcb8285..01e5415 100755\n--- a/t/t7602-merge-octopus-many.sh\n+++ b/t/t7602-merge-octopus-many.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh\nindex 17b19dc..b47b7b9 100755\n--- a/t/t7603-merge-reduce-heads.sh\n+++ b/t/t7603-merge-reduce-heads.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh\nindex 6081677..de977c5 100755\n--- a/t/t7604-merge-custom-message.sh\n+++ b/t/t7604-merge-custom-message.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh\nindex f1f86dd..0cb9d11 100755\n--- a/t/t7605-merge-resolve.sh\n+++ b/t/t7605-merge-resolve.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-merge\n+test_description='git merge\n \ndiff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh\nindex 9285071..09fa5f1 100755\n--- a/t/t7610-mergetool.sh\n+++ b/t/t7610-mergetool.sh\n@@ -5,3 +5,3 @@\n \n-test_description='git-mergetool\n+test_description='git mergetool\n \ndiff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh\nindex 31c340f..531dac0 100755\n--- a/t/t7701-repack-unpack-unreachable.sh\n+++ b/t/t7701-repack-unpack-unreachable.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-repack works correctly'\n+test_description='git repack works correctly'\n \ndiff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh\nindex 1c857cf..d098a01 100755\n--- a/t/t9001-send-email.sh\n+++ b/t/t9001-send-email.sh\n@@ -2,3 +2,3 @@\n \n-test_description='git-send-email'\n+test_description='git send-email'\n . ./test-lib.sh\n-- \n1.6.0.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"}]}