{"thread":{"id":"15348","subject":"[PATCH 2/4] tests: use \"git xyzzy\" form (t3600 - t6999)","startedAt":"2008-09-03T08:59:29Z","lastAt":"2008-09-03T08:59:29Z","messageCount":1,"participants":["Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"89600","messageId":"20080903175929.6117@nanako3.lavabit.com","threadId":"15348","inReplyTo":null,"subject":"[PATCH 2/4] tests: use \"git xyzzy\" form (t3600 - t6999)","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-03T08:59:29Z","receivedAt":"2008-09-03T08:59:29Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Converts tests between t3600-t6300.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t3600-rm.sh                 |    4 ++--\n t/t4012-diff-binary.sh        |    4 ++--\n t/t4103-apply-binary.sh       |   26 +++++++++++++-------------\n t/t4124-apply-ws-rule.sh      |    2 +-\n t/t4127-apply-same-fn.sh      |    4 ++--\n t/t4150-am.sh                 |    2 +-\n t/t4151-am-abort.sh           |    4 ++--\n t/t5300-pack-object.sh        |   14 +++++++-------\n t/t5301-sliding-window.sh     |    4 ++--\n t/t5302-pack-index.sh         |   12 ++++++------\n t/t5400-send-pack.sh          |   30 +++++++++++++++---------------\n t/t5401-update-hooks.sh       |    4 ++--\n t/t5402-post-merge-hook.sh    |    4 ++--\n t/t5403-post-checkout-hook.sh |    4 ++--\n t/t5500-fetch-pack.sh         |    4 ++--\n t/t5510-fetch.sh              |    2 +-\n t/t5530-upload-pack-error.sh  |    4 ++--\n t/t5600-clone-fail-cleanup.sh |   12 ++++++------\n t/t5602-clone-remote-exec.sh  |    4 ++--\n t/t6006-rev-list-format.sh    |    6 +++---\n t/t6025-merge-symlinks.sh     |   32 ++++++++++++++++----------------\n t/t6026-merge-attr.sh         |   12 ++++++------\n t/t6030-bisect-porcelain.sh   |    4 ++--\n t/t6120-describe.sh           |   30 +++++++++++++++---------------\n t/t6300-for-each-ref.sh       |   28 ++++++++++++++--------------\n 25 files changed, 128 insertions(+), 128 deletions(-)\n\ndiff --git a/t/t3600-rm.sh b/t/t3600-rm.sh\nindex 79c06ad..558c80e 100755\n--- a/t/t3600-rm.sh\n+++ b/t/t3600-rm.sh\n@@ -14,3 +14,3 @@ test_expect_success \\\n      git add -- foo bar baz 'space embedded' -q &&\n-     git-commit -m 'add normal files' &&\n+     git commit -m 'add normal files' &&\n      test_tabs=y &&\n@@ -21,3 +21,3 @@ embedded'\n embedded' &&\n-     git-commit -m 'add files with tabs and newlines'\n+     git commit -m 'add files with tabs and newlines'\n      else\ndiff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh\nindex 6993499..b8ec6e9 100755\n--- a/t/t4012-diff-binary.sh\n+++ b/t/t4012-diff-binary.sh\n@@ -63,3 +63,3 @@ test_expect_success 'apply detecting corrupt patch correctly' \\\n \n-test_expect_success 'initial commit' 'git-commit -a -m initial'\n+test_expect_success 'initial commit' 'git commit -a -m initial'\n \n@@ -74,3 +74,3 @@ test_expect_success 'diff-index with --binary' \\\n test_expect_success 'apply binary patch' \\\n-\t'git-reset --hard &&\n+\t'git reset --hard &&\n \t git apply --binary --index <current &&\ndiff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh\nindex 7da0b4b..ad4cc1a 100755\n--- a/t/t4103-apply-binary.sh\n+++ b/t/t4103-apply-binary.sh\n@@ -23,5 +23,5 @@ cat file1 >file4\n git update-index --add --remove file1 file2 file4\n-git-commit -m 'Initial Version' 2>/dev/null\n+git commit -m 'Initial Version' 2>/dev/null\n \n-git-checkout -b binary\n+git checkout -b binary\n perl -pe 'y/x/\\000/' <file1 >file3\n@@ -32,3 +32,3 @@ rm -f file2\n git update-index --add --remove file1 file2 file3 file4\n-git-commit -m 'Second Version'\n+git commit -m 'Second Version'\n \n@@ -41,3 +41,3 @@ git diff-tree -p --binary -C master binary >CF.diff\n test_expect_success 'stat binary diff -- should not fail.' \\\n-\t'git-checkout master\n+\t'git checkout master\n \t git apply --stat --summary B.diff'\n@@ -45,3 +45,3 @@ test_expect_success 'stat binary diff -- should not fail.' \\\n test_expect_success 'stat binary diff (copy) -- should not fail.' \\\n-\t'git-checkout master\n+\t'git checkout master\n \t git apply --stat --summary C.diff'\n@@ -49,3 +49,3 @@ test_expect_success 'stat binary diff (copy) -- should not fail.' \\\n test_expect_success 'check binary diff -- should fail.' \\\n-\t'git-checkout master &&\n+\t'git checkout master &&\n \t test_must_fail git apply --check B.diff'\n@@ -53,3 +53,3 @@ test_expect_success 'check binary diff -- should fail.' \\\n test_expect_success 'check binary diff (copy) -- should fail.' \\\n-\t'git-checkout master &&\n+\t'git checkout master &&\n \t test_must_fail git apply --check C.diff'\n@@ -58,3 +58,3 @@ test_expect_success \\\n \t'check incomplete binary diff with replacement -- should fail.' '\n-\tgit-checkout master &&\n+\tgit checkout master &&\n \ttest_must_fail git apply --check --allow-binary-replacement B.diff\n@@ -64,3 +64,3 @@ test_expect_success \\\n     'check incomplete binary diff with replacement (copy) -- should fail.' '\n-\t git-checkout master &&\n+\t git checkout master &&\n \t test_must_fail git apply --check --allow-binary-replacement C.diff\n@@ -69,3 +69,3 @@ test_expect_success \\\n test_expect_success 'check binary diff with replacement.' \\\n-\t'git-checkout master\n+\t'git checkout master\n \t git apply --check --allow-binary-replacement BF.diff'\n@@ -73,3 +73,3 @@ test_expect_success 'check binary diff with replacement.' \\\n test_expect_success 'check binary diff with replacement (copy).' \\\n-\t'git-checkout master\n+\t'git checkout master\n \t git apply --check --allow-binary-replacement CF.diff'\n@@ -80,4 +80,4 @@ do_reset () {\n \trm -f file? &&\n-\tgit-reset --hard &&\n-\tgit-checkout -f master\n+\tgit reset --hard &&\n+\tgit checkout -f master\n }\ndiff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh\nindex 85f3da2..f83322e 100755\n--- a/t/t4124-apply-ws-rule.sh\n+++ b/t/t4124-apply-ws-rule.sh\n@@ -2,3 +2,3 @@\n \n-test_description='core.whitespace rules and git-apply'\n+test_description='core.whitespace rules and git apply'\n \ndiff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh\nindex 1f859dd..3a8202e 100755\n--- a/t/t4127-apply-same-fn.sh\n+++ b/t/t4127-apply-same-fn.sh\n@@ -28,3 +28,3 @@ test_expect_success 'apply same filename with independent changes' '\n \tgit reset --hard &&\n-\tgit-apply patch0 &&\n+\tgit apply patch0 &&\n \tdiff same_fn same_fn2\n@@ -41,3 +41,3 @@ test_expect_success 'apply same filename with overlapping changes' '\n \tgit reset --hard &&\n-\tgit-apply patch0 &&\n+\tgit apply patch0 &&\n \tdiff same_fn same_fn2\ndiff --git a/t/t4150-am.sh b/t/t4150-am.sh\nindex 6e6aaf5..1be5fb3 100755\n--- a/t/t4150-am.sh\n+++ b/t/t4150-am.sh\n@@ -166,3 +166,3 @@ test_expect_success 'am --keep really keeps the subject' '\n \t! test -d .git/rebase-apply &&\n-\tgit-cat-file commit HEAD |\n+\tgit cat-file commit HEAD |\n \t\tgrep -q -F \"Re: Re: Re: [PATCH 1/5 v2] third\"\ndiff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh\nindex 7d86cdf..4448aba 100755\n--- a/t/t4151-am-abort.sh\n+++ b/t/t4151-am-abort.sh\n@@ -46,3 +46,3 @@ do\n \ttest_expect_success \"am$with3 --skip continue after failed am$with3\" '\n-\t\ttest_must_fail git-am$with3 --skip >output &&\n+\t\ttest_must_fail git am$with3 --skip >output &&\n \t\ttest \"$(grep \"^Applying\" output)\" = \"Applying: 6\" &&\n@@ -53,3 +53,3 @@ do\n \ttest_expect_success \"am --abort goes back after failed am$with3\" '\n-\t\tgit-am --abort &&\n+\t\tgit am --abort &&\n \t\tgit rev-parse HEAD >actual &&\ndiff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh\nindex 83abe5f..0c14003 100755\n--- a/t/t5300-pack-object.sh\n+++ b/t/t5300-pack-object.sh\n@@ -244,6 +244,6 @@ test_expect_success \\\n     'cat test-1-${packname_1}.pack >test-3.pack &&\n-     git-index-pack -o tmp.idx test-3.pack &&\n+     git index-pack -o tmp.idx test-3.pack &&\n      cmp tmp.idx test-1-${packname_1}.idx &&\n \n-     git-index-pack test-3.pack &&\n+     git index-pack test-3.pack &&\n      cmp test-3.idx test-1-${packname_1}.idx &&\n@@ -251,6 +251,6 @@ test_expect_success \\\n      cat test-2-${packname_2}.pack >test-3.pack &&\n-     git-index-pack -o tmp.idx test-2-${packname_2}.pack &&\n+     git index-pack -o tmp.idx test-2-${packname_2}.pack &&\n      cmp tmp.idx test-2-${packname_2}.idx &&\n \n-     git-index-pack test-3.pack &&\n+     git index-pack test-3.pack &&\n      cmp test-3.idx test-2-${packname_2}.idx &&\n@@ -258,6 +258,6 @@ test_expect_success \\\n      cat test-3-${packname_3}.pack >test-3.pack &&\n-     git-index-pack -o tmp.idx test-3-${packname_3}.pack &&\n+     git index-pack -o tmp.idx test-3-${packname_3}.pack &&\n      cmp tmp.idx test-3-${packname_3}.idx &&\n \n-     git-index-pack test-3.pack &&\n+     git index-pack test-3.pack &&\n      cmp test-3.idx test-3-${packname_3}.idx &&\n@@ -274,3 +274,3 @@ test_expect_success \\\n     'make sure index-pack detects the SHA1 collision' \\\n-    'test_must_fail git-index-pack -o bad.idx test-3.pack'\n+    'test_must_fail git index-pack -o bad.idx test-3.pack'\n \ndiff --git a/t/t5301-sliding-window.sh b/t/t5301-sliding-window.sh\nindex 073ac0c..0a24e61 100755\n--- a/t/t5301-sliding-window.sh\n+++ b/t/t5301-sliding-window.sh\n@@ -21,3 +21,3 @@ test_expect_success \\\n      git update-ref HEAD $commit1 &&\n-     git-repack -a -d &&\n+     git repack -a -d &&\n      test \"`git count-objects`\" = \"0 objects, 0 kilobytes\" &&\n@@ -47,3 +47,3 @@ test_expect_success \\\n      git update-ref HEAD $commit2 &&\n-     git-repack -a -d &&\n+     git repack -a -d &&\n      test \"`git count-objects`\" = \"0 objects, 0 kilobytes\" &&\ndiff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh\nindex 0639772..6424db1 100755\n--- a/t/t5302-pack-index.sh\n+++ b/t/t5302-pack-index.sh\n@@ -50,3 +50,3 @@ test_expect_success \\\n     'index-pack with index version 1' \\\n-    'git-index-pack --index-version=1 -o 1.idx \"test-1-${pack1}.pack\"'\n+    'git index-pack --index-version=1 -o 1.idx \"test-1-${pack1}.pack\"'\n \n@@ -54,3 +54,3 @@ test_expect_success \\\n     'index-pack with index version 2' \\\n-    'git-index-pack --index-version=2 -o 2.idx \"test-1-${pack1}.pack\"'\n+    'git index-pack --index-version=2 -o 2.idx \"test-1-${pack1}.pack\"'\n \n@@ -87,3 +87,3 @@ test_expect_success \\\n     'index v2: force some 64-bit offsets with index-pack' \\\n-    'git-index-pack --index-version=2,0x40000 -o 3.idx \"test-1-${pack1}.pack\"'\n+    'git index-pack --index-version=2,0x40000 -o 3.idx \"test-1-${pack1}.pack\"'\n \n@@ -96,3 +96,3 @@ test_expect_success \\\n     '[index v1] 1) stream pack to repository' \\\n-    'git-index-pack --index-version=1 --stdin < \"test-1-${pack1}.pack\" &&\n+    'git index-pack --index-version=1 --stdin < \"test-1-${pack1}.pack\" &&\n      git prune-packed &&\n@@ -134,3 +134,3 @@ test_expect_success \\\n     'rm -f .git/objects/pack/* &&\n-     git-index-pack --index-version=2 --stdin < \"test-1-${pack1}.pack\" &&\n+     git index-pack --index-version=2 --stdin < \"test-1-${pack1}.pack\" &&\n      git prune-packed &&\n@@ -167,3 +167,3 @@ test_expect_success \\\n     'rm -f .git/objects/pack/* &&\n-     git-index-pack --index-version=2 --stdin < \"test-1-${pack1}.pack\" &&\n+     git index-pack --index-version=2 --stdin < \"test-1-${pack1}.pack\" &&\n      git verify-pack \".git/objects/pack/pack-${pack1}.pack\" &&\ndiff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh\nindex 68c2ae6..544771d 100755\n--- a/t/t5400-send-pack.sh\n+++ b/t/t5400-send-pack.sh\n@@ -33,3 +33,3 @@ test_expect_success setup '\n \tgit update-ref HEAD \"$commit\" &&\n-\tgit-clone ./. victim &&\n+\tgit clone ./. victim &&\n \tcd victim &&\n@@ -70,3 +70,3 @@ test_expect_success \\\n \t# should not fail but refuse to update.\n-\tif git-send-pack ./victim/.git/ master\n+\tif git send-pack ./victim/.git/ master\n \tthen\n@@ -87,3 +87,3 @@ test_expect_success \\\n \t# this should update\n-\tgit-send-pack --force ./victim/.git/ master &&\n+\tgit send-pack --force ./victim/.git/ master &&\n \tcmp victim/.git/refs/heads/master .git/refs/heads/master\n@@ -97,3 +97,3 @@ test_expect_success \\\n \ttest -f victim/.git/refs/heads/extra &&\n-\tgit-send-pack ./victim/.git/ :extra master &&\n+\tgit send-pack ./victim/.git/ :extra master &&\n \t! test -f victim/.git/refs/heads/extra\n@@ -111,3 +111,3 @@ test_expect_success \\\n \tgit update-ref refs/heads/master master^ || return 1\n-\tgit-send-pack --force ./victim/.git/ master && return 1\n+\tgit send-pack --force ./victim/.git/ master && return 1\n \t! test_cmp .git/refs/heads/master victim/.git/refs/heads/master\n@@ -118,7 +118,7 @@ test_expect_success \\\n \tmkdir parent && cd parent &&\n-\tgit-init && touch file && git-add file && git-commit -m add &&\n+\tgit init && touch file && git add file && git commit -m add &&\n \tcd .. &&\n-\tgit-clone parent child && cd child && git-push --all &&\n+\tgit clone parent child && cd child && git push --all &&\n \tcd ../parent &&\n-\tgit-branch -a >branches && ! grep origin/master branches\n+\tgit branch -a >branches && ! grep origin/master branches\n '\n@@ -128,6 +128,6 @@ rewound_push_setup() {\n \tmkdir parent && cd parent &&\n-\tgit-init && echo one >file && git-add file && git-commit -m one &&\n-\techo two >file && git-commit -a -m two &&\n+\tgit init && echo one >file && git add file && git commit -m one &&\n+\techo two >file && git commit -a -m two &&\n \tcd .. &&\n-\tgit-clone parent child && cd child && git-reset --hard HEAD^\n+\tgit clone parent child && cd child && git reset --hard HEAD^\n }\n@@ -150,3 +150,3 @@ test_expect_success \\\n \trewound_push_setup &&\n-\tif git-send-pack ../parent/.git refs/heads/master:refs/heads/master\n+\tif git send-pack ../parent/.git refs/heads/master:refs/heads/master\n \tthen\n@@ -156,3 +156,3 @@ test_expect_success \\\n \tfi && rewound_push_failed &&\n-\tgit-send-pack ../parent/.git +refs/heads/master:refs/heads/master &&\n+\tgit send-pack ../parent/.git +refs/heads/master:refs/heads/master &&\n \trewound_push_succeeded\n@@ -163,3 +163,3 @@ test_expect_success \\\n \trewound_push_setup &&\n-\tif git-send-pack ../parent/.git refs/heads/*:refs/heads/*\n+\tif git send-pack ../parent/.git refs/heads/*:refs/heads/*\n \tthen\n@@ -169,3 +169,3 @@ test_expect_success \\\n \tfi && rewound_push_failed &&\n-\tgit-send-pack ../parent/.git +refs/heads/*:refs/heads/* &&\n+\tgit send-pack ../parent/.git +refs/heads/*:refs/heads/* &&\n \trewound_push_succeeded\ndiff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh\nindex ee769d6..64f66c9 100755\n--- a/t/t5401-update-hooks.sh\n+++ b/t/t5401-update-hooks.sh\n@@ -19,3 +19,3 @@ test_expect_success setup '\n \tgit update-ref refs/heads/tofail $commit1 &&\n-\tgit-clone ./. victim &&\n+\tgit clone ./. victim &&\n \tGIT_DIR=victim/.git git update-ref refs/heads/tofail $commit1 &&\n@@ -63,3 +63,3 @@ chmod u+x victim/.git/hooks/post-update\n test_expect_success push '\n-\ttest_must_fail git-send-pack --force ./victim/.git \\\n+\ttest_must_fail git send-pack --force ./victim/.git \\\n \t\tmaster tofail >send.out 2>send.err\ndiff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh\nindex 1394047..6eb2ffd 100755\n--- a/t/t5402-post-merge-hook.sh\n+++ b/t/t5402-post-merge-hook.sh\n@@ -18,5 +18,5 @@ test_expect_success setup '\n         git update-ref refs/heads/master $commit0 &&\n-\tgit-clone ./. clone1 &&\n+\tgit clone ./. clone1 &&\n \tGIT_DIR=clone1/.git git update-index --add a &&\n-\tgit-clone ./. clone2 &&\n+\tgit clone ./. clone2 &&\n \tGIT_DIR=clone2/.git git update-index --add a\ndiff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh\nindex 823239a..9b2e1a9 100755\n--- a/t/t5403-post-checkout-hook.sh\n+++ b/t/t5403-post-checkout-hook.sh\n@@ -16,4 +16,4 @@ test_expect_success setup '\n         git update-ref refs/heads/master $commit0 &&\n-\t git-clone ./. clone1 &&\n-\t git-clone ./. clone2 &&\n+\t git clone ./. clone1 &&\n+\t git clone ./. clone2 &&\n         GIT_DIR=clone2/.git git branch -a new2 &&\ndiff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh\nindex 7125bae..c450f33 100755\n--- a/t/t5500-fetch-pack.sh\n+++ b/t/t5500-fetch-pack.sh\n@@ -60,3 +60,3 @@ pull_to_client () {\n \ttest_expect_success \"$number pull\" \\\n-\t\t\"git-fetch-pack -k -v .. $heads\"\n+\t\t\"git fetch-pack -k -v .. $heads\"\n \tcase \"$heads\" in *A*) echo $ATIP > .git/refs/heads/A;; esac\n@@ -131,3 +131,3 @@ pull_to_client 3rd \"A\" $((1*3)) # old fails\n \n-test_expect_success \"clone shallow\" 'git-clone --depth 2 \"file://$(pwd)/.\" shallow'\n+test_expect_success \"clone shallow\" 'git clone --depth 2 \"file://$(pwd)/.\" shallow'\n \ndiff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh\nindex 13d1d82..de26c20 100755\n--- a/t/t5510-fetch.sh\n+++ b/t/t5510-fetch.sh\n@@ -113,3 +113,3 @@ test_expect_success 'fetch must not resolve short remote name' '\n \tcd \"$D\" &&\n-\tgit-update-ref refs/remotes/six/HEAD HEAD\n+\tgit update-ref refs/remotes/six/HEAD HEAD\n \ndiff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh\nindex 1a15817..f5102b9 100755\n--- a/t/t5530-upload-pack-error.sh\n+++ b/t/t5530-upload-pack-error.sh\n@@ -36,3 +36,3 @@ test_expect_success 'upload-pack fails due to error in pack-objects' '\n 00000009done\n-0000\" | git-upload-pack . > /dev/null 2> output.err &&\n+0000\" | git upload-pack . > /dev/null 2> output.err &&\n \tgrep \"pack-objects died\" output.err\n@@ -54,3 +54,3 @@ test_expect_success 'upload-pack fails due to error in rev-list' '\n 00000009done\n-0000\" | git-upload-pack . > /dev/null 2> output.err &&\n+0000\" | git upload-pack . > /dev/null 2> output.err &&\n \tgrep \"waitpid (async) failed\" output.err\ndiff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh\nindex 3c013e2..ee06d28 100755\n--- a/t/t5600-clone-fail-cleanup.sh\n+++ b/t/t5600-clone-fail-cleanup.sh\n@@ -5,5 +5,5 @@\n \n-test_description='test git-clone to cleanup after failure\n+test_description='test git clone to cleanup after failure\n \n-This test covers the fact that if git-clone fails, it should remove\n+This test covers the fact that if git clone fails, it should remove\n the directory it created, to avoid the user having to manually\n@@ -15,3 +15,3 @@ test_expect_success \\\n     'clone of non-existent source should fail' \\\n-    'test_must_fail git-clone foo bar'\n+    'test_must_fail git clone foo bar'\n \n@@ -27,3 +27,3 @@ test_create_repo foo\n \n-# source repository given to git-clone should be relative to the\n+# source repository given to git clone should be relative to the\n # current path not to the target dir\n@@ -31,3 +31,3 @@ test_expect_success \\\n     'clone of non-existent (relative to $PWD) source should fail' \\\n-    'test_must_fail git-clone ../foo baz'\n+    'test_must_fail git clone ../foo baz'\n \n@@ -35,3 +35,3 @@ test_expect_success \\\n     'clone should work now that source exists' \\\n-    'git-clone foo bar'\n+    'git clone foo bar'\n \ndiff --git a/t/t5602-clone-remote-exec.sh b/t/t5602-clone-remote-exec.sh\nindex 8367a68..82b1d1e 100755\n--- a/t/t5602-clone-remote-exec.sh\n+++ b/t/t5602-clone-remote-exec.sh\n@@ -13,3 +13,3 @@ test_expect_success setup '\n \n-test_expect_success 'clone calls git-upload-pack unqualified with no -u option' '\n+test_expect_success 'clone calls git upload-pack unqualified with no -u option' '\n \tGIT_SSH=./not_ssh git clone localhost:/path/to/repo junk\n@@ -19,3 +19,3 @@ test_expect_success 'clone calls git-upload-pack unqualified with no -u option'\n \n-test_expect_success 'clone calls specified git-upload-pack with -u option' '\n+test_expect_success 'clone calls specified git upload-pack with -u option' '\n \tGIT_SSH=./not_ssh git clone -u /something/bin/git-upload-pack localhost:/path/to/repo junk\ndiff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh\nindex 485ad4d..86bf7e1 100755\n--- a/t/t6006-rev-list-format.sh\n+++ b/t/t6006-rev-list-format.sh\n@@ -8,4 +8,4 @@ test_tick\n test_expect_success 'setup' '\n-touch foo && git add foo && git-commit -m \"added foo\" &&\n-  echo changed >foo && git-commit -a -m \"changed foo\"\n+touch foo && git add foo && git commit -m \"added foo\" &&\n+  echo changed >foo && git commit -a -m \"changed foo\"\n '\n@@ -112,3 +112,3 @@ test_expect_success 'setup complex body' '\n git config i18n.commitencoding iso8859-1 &&\n-  echo change2 >foo && git-commit -a -F commit-msg\n+  echo change2 >foo && git commit -a -F commit-msg\n '\ndiff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh\nindex fc58456..53892a5 100755\n--- a/t/t6025-merge-symlinks.sh\n+++ b/t/t6025-merge-symlinks.sh\n@@ -7,3 +7,3 @@ test_description='merging symlinks on filesystem w/o symlink support.\n \n-This tests that git-merge-recursive writes merge results as plain files\n+This tests that git merge-recursive writes merge results as plain files\n if core.symlinks is false.'\n@@ -17,16 +17,16 @@ git config core.symlinks false &&\n git add file &&\n-git-commit -m initial &&\n+git commit -m initial &&\n git branch b-symlink &&\n git branch b-file &&\n-l=$(echo -n file | git-hash-object -t blob -w --stdin) &&\n+l=$(echo -n file | git hash-object -t blob -w --stdin) &&\n echo \"120000 $l\tsymlink\" | git update-index --index-info &&\n-git-commit -m master &&\n-git-checkout b-symlink &&\n-l=$(echo -n file-different | git-hash-object -t blob -w --stdin) &&\n+git commit -m master &&\n+git checkout b-symlink &&\n+l=$(echo -n file-different | git hash-object -t blob -w --stdin) &&\n echo \"120000 $l\tsymlink\" | git update-index --index-info &&\n-git-commit -m b-symlink &&\n-git-checkout b-file &&\n+git commit -m b-symlink &&\n+git checkout b-file &&\n echo plain-file > symlink &&\n git add symlink &&\n-git-commit -m b-file'\n+git commit -m b-file'\n \n@@ -34,4 +34,4 @@ test_expect_success \\\n 'merge master into b-symlink, which has a different symbolic link' '\n-git-checkout b-symlink &&\n-test_must_fail git-merge master'\n+git checkout b-symlink &&\n+test_must_fail git merge master'\n \n@@ -43,4 +43,4 @@ test_expect_success \\\n 'merge master into b-file, which has a file instead of a symbolic link' '\n-git-reset --hard && git-checkout b-file &&\n-test_must_fail git-merge master'\n+git reset --hard && git checkout b-file &&\n+test_must_fail git merge master'\n \n@@ -52,5 +52,5 @@ test_expect_success \\\n 'merge b-file, which has a file instead of a symbolic link, into master' '\n-git-reset --hard &&\n-git-checkout master &&\n-test_must_fail git-merge b-file'\n+git reset --hard &&\n+git checkout master &&\n+test_must_fail git merge b-file'\n \ndiff --git a/t/t6026-merge-attr.sh b/t/t6026-merge-attr.sh\nindex 56fc341..4b423e9 100755\n--- a/t/t6026-merge-attr.sh\n+++ b/t/t6026-merge-attr.sh\n@@ -108,5 +108,5 @@ test_expect_success 'custom merge backend' '\n \tsed -e 1,3d text >check-1 &&\n-\to=$(git-unpack-file master^:text) &&\n-\ta=$(git-unpack-file side^:text) &&\n-\tb=$(git-unpack-file master:text) &&\n+\to=$(git unpack-file master^:text) &&\n+\ta=$(git unpack-file side^:text) &&\n+\tb=$(git unpack-file master:text) &&\n \tsh -c \"./custom-merge $o $a $b 0\" &&\n@@ -135,5 +135,5 @@ test_expect_success 'custom merge backend' '\n \tsed -e 1,3d text >check-1 &&\n-\to=$(git-unpack-file master^:text) &&\n-\ta=$(git-unpack-file anchor:text) &&\n-\tb=$(git-unpack-file master:text) &&\n+\to=$(git unpack-file master^:text) &&\n+\ta=$(git unpack-file anchor:text) &&\n+\tb=$(git unpack-file master:text) &&\n \tsh -c \"./custom-merge $o $a $b 0\" &&\ndiff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh\nindex 244fda6..36c9a69 100755\n--- a/t/t6030-bisect-porcelain.sh\n+++ b/t/t6030-bisect-porcelain.sh\n@@ -4,3 +4,3 @@\n #\n-test_description='Tests git-bisect functionality'\n+test_description='Tests git bisect functionality'\n \n@@ -25,3 +25,3 @@ add_line_into_file()\n     test_tick\n-    git-commit --quiet -m \"$MSG\" $_file\n+    git commit --quiet -m \"$MSG\" $_file\n }\ndiff --git a/t/t6120-describe.sh b/t/t6120-describe.sh\nindex 2fb672c..16cc635 100755\n--- a/t/t6120-describe.sh\n+++ b/t/t6120-describe.sh\n@@ -33,3 +33,3 @@ test_expect_success setup '\n \ttest_tick &&\n-\techo one >file && git add file && git-commit -m initial &&\n+\techo one >file && git add file && git commit -m initial &&\n \tone=$(git rev-parse HEAD) &&\n@@ -37,3 +37,3 @@ test_expect_success setup '\n \ttest_tick &&\n-\techo two >file && git add file && git-commit -m second &&\n+\techo two >file && git add file && git commit -m second &&\n \ttwo=$(git rev-parse HEAD) &&\n@@ -41,13 +41,13 @@ test_expect_success setup '\n \ttest_tick &&\n-\techo three >file && git add file && git-commit -m third &&\n+\techo three >file && git add file && git commit -m third &&\n \n \ttest_tick &&\n-\techo A >file && git add file && git-commit -m A &&\n+\techo A >file && git add file && git commit -m A &&\n \ttest_tick &&\n-\tgit-tag -a -m A A &&\n+\tgit tag -a -m A A &&\n \n \ttest_tick &&\n-\techo c >file && git add file && git-commit -m c &&\n+\techo c >file && git add file && git commit -m c &&\n \ttest_tick &&\n-\tgit-tag c &&\n+\tgit tag c &&\n \n@@ -55,8 +55,8 @@ test_expect_success setup '\n \ttest_tick &&\n-\techo B >side && git add side && git-commit -m B &&\n+\techo B >side && git add side && git commit -m B &&\n \ttest_tick &&\n-\tgit-tag -a -m B B &&\n+\tgit tag -a -m B B &&\n \n \ttest_tick &&\n-\tgit-merge -m Merged c &&\n+\tgit merge -m Merged c &&\n \tmerged=$(git rev-parse HEAD) &&\n@@ -65,5 +65,5 @@ test_expect_success setup '\n \ttest_tick &&\n-\techo D >another && git add another && git-commit -m D &&\n+\techo D >another && git add another && git commit -m D &&\n \ttest_tick &&\n-\tgit-tag -a -m D D &&\n+\tgit tag -a -m D D &&\n \n@@ -73,3 +73,3 @@ test_expect_success setup '\n \ttest_tick &&\n-\tgit-tag e &&\n+\tgit tag e &&\n \n@@ -79,3 +79,3 @@ test_expect_success setup '\n \ttest_tick &&\n-\tgit-merge -m Merged $merged &&\n+\tgit merge -m Merged $merged &&\n \n@@ -83,3 +83,3 @@ test_expect_success setup '\n \techo X >file && echo X >side && git add file side &&\n-\tgit-commit -m x\n+\tgit commit -m x\n \ndiff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh\nindex 8ced593..26995b3 100755\n--- a/t/t6300-for-each-ref.sh\n+++ b/t/t6300-for-each-ref.sh\n@@ -99,3 +99,3 @@ test_atom tag contents 'Tagging at 1151939927\n test_expect_success 'Check invalid atoms names are errors' '\n-\ttest_must_fail git-for-each-ref --format=\"%(INVALID)\" refs/heads\n+\ttest_must_fail git for-each-ref --format=\"%(INVALID)\" refs/heads\n '\n@@ -103,6 +103,6 @@ test_expect_success 'Check invalid atoms names are errors' '\n test_expect_success 'Check format specifiers are ignored in naming date atoms' '\n-\tgit-for-each-ref --format=\"%(authordate)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:default) %(authordate)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate) %(authordate:default)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:default) %(authordate:default)\" refs/heads\n+\tgit for-each-ref --format=\"%(authordate)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:default) %(authordate)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate) %(authordate:default)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:default) %(authordate:default)\" refs/heads\n '\n@@ -110,8 +110,8 @@ test_expect_success 'Check format specifiers are ignored in naming date atoms' '\n test_expect_success 'Check valid format specifiers for date fields' '\n-\tgit-for-each-ref --format=\"%(authordate:default)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:relative)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:short)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:local)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:iso8601)\" refs/heads &&\n-\tgit-for-each-ref --format=\"%(authordate:rfc2822)\" refs/heads\n+\tgit for-each-ref --format=\"%(authordate:default)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:relative)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:short)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:local)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:iso8601)\" refs/heads &&\n+\tgit for-each-ref --format=\"%(authordate:rfc2822)\" refs/heads\n '\n@@ -119,3 +119,3 @@ test_expect_success 'Check valid format specifiers for date fields' '\n test_expect_success 'Check invalid format specifiers are errors' '\n-\ttest_must_fail git-for-each-ref --format=\"%(authordate:INVALID)\" refs/heads\n+\ttest_must_fail git for-each-ref --format=\"%(authordate:INVALID)\" refs/heads\n '\n@@ -209,3 +209,3 @@ EOF\n test_expect_success 'Verify ascending sort' '\n-\tgit-for-each-ref --format=\"%(refname)\" --sort=refname >actual &&\n+\tgit for-each-ref --format=\"%(refname)\" --sort=refname >actual &&\n \ttest_cmp expected actual\n@@ -220,3 +220,3 @@ EOF\n test_expect_success 'Verify descending sort' '\n-\tgit-for-each-ref --format=\"%(refname)\" --sort=-refname >actual &&\n+\tgit for-each-ref --format=\"%(refname)\" --sort=-refname >actual &&\n \ttest_cmp expected actual\n-- \n1.6.0.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"}]}