{"thread":{"id":"15347","subject":"[PATCH 1/4] tests: use \"git xyzzy\" form (t0000 - t3599)","startedAt":"2008-09-03T08:59:27Z","lastAt":"2008-09-03T08:59:27Z","messageCount":1,"participants":["Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"89599","messageId":"20080903175927.6117@nanako3.lavabit.com","threadId":"15347","inReplyTo":null,"subject":"[PATCH 1/4] tests: use \"git xyzzy\" form (t0000 - t3599)","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-03T08:59:27Z","receivedAt":"2008-09-03T08:59:27Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Converts tests between t0050-t3903.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t0050-filesystem.sh              |    2 +-\n t/t1007-hash-object.sh             |    2 +-\n t/t1200-tutorial.sh                |    2 +-\n t/t1303-wacky-config.sh            |    2 +-\n t/t1400-update-ref.sh              |   10 +++---\n t/t1503-rev-parse-verify.sh        |    2 +-\n t/t2005-checkout-index-symlinks.sh |    4 +-\n t/t2050-git-dir-relative.sh        |    4 +-\n t/t2101-update-index-reupdate.sh   |    2 +-\n t/t2102-update-index-symlinks.sh   |    2 +-\n t/t2200-add-update.sh              |   12 ++++----\n t/t3001-ls-files-others-exclude.sh |    2 +-\n t/t3020-ls-files-error-unmatch.sh  |    2 +-\n t/t3030-merge-recursive.sh         |   14 ++++----\n t/t3200-branch.sh                  |   58 ++++++++++++++++++------------------\n t/t3210-pack-refs.sh               |    4 +-\n t/t3400-rebase.sh                  |    6 ++--\n t/t3401-rebase-partial.sh          |   22 +++++++-------\n t/t3403-rebase-skip.sh             |    2 +-\n t/t3404-rebase-interactive.sh      |    2 +-\n t/t3407-rebase-abort.sh            |    2 +-\n t/t3500-cherry.sh                  |   12 ++++----\n t/t3800-mktag.sh                   |   12 ++++----\n t/t3900-i18n-commit.sh             |    6 ++--\n t/t3901-i18n-patch.sh              |   16 +++++-----\n t/t3903-stash.sh                   |    2 +-\n 26 files changed, 103 insertions(+), 103 deletions(-)\n\ndiff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh\nindex b177174..7edf49d 100755\n--- a/t/t0050-filesystem.sh\n+++ b/t/t0050-filesystem.sh\n@@ -87,3 +87,3 @@ $test_case 'add (with different case)' '\n \tgit add CamelCase &&\n-\ttest $(git-ls-files | grep -i camelcase | wc -l) = 1\n+\ttest $(git ls-files | grep -i camelcase | wc -l) = 1\n \ndiff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh\nindex fcdd15a..fd98e44 100755\n--- a/t/t1007-hash-object.sh\n+++ b/t/t1007-hash-object.sh\n@@ -2,3 +2,3 @@\n \n-test_description=\"git-hash-object\"\n+test_description=\"git hash-object\"\n \ndiff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh\nindex 09a8199..67e637b 100755\n--- a/t/t1200-tutorial.sh\n+++ b/t/t1200-tutorial.sh\n@@ -80,3 +80,3 @@ test_expect_success 'git tag my-first-tag' 'cmp .git/refs/heads/master .git/refs\n \n-# TODO: test git-clone\n+# TODO: test git clone\n \ndiff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh\nindex f98f4c5..1983076 100755\n--- a/t/t1303-wacky-config.sh\n+++ b/t/t1303-wacky-config.sh\n@@ -37,3 +37,3 @@ test_expect_success 'add key in different section' '\n SECTION=\"test.q\\\"s\\\\sq'sp e.key\"\n-test_expect_success 'make sure git-config escapes section names properly' '\n+test_expect_success 'make sure git config escapes section names properly' '\n \tgit config \"$SECTION\" bar &&\ndiff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh\nindex b31e4b1..04c2b16 100755\n--- a/t/t1400-update-ref.sh\n+++ b/t/t1400-update-ref.sh\n@@ -230,3 +230,3 @@ test_expect_success \\\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:30\" \\\n-\t GIT_COMMITTER_DATE=\"2005-05-26 23:30\" git-commit -m add -a &&\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:30\" git commit -m add -a &&\n \t h_TEST=$(git rev-parse --verify HEAD)\n@@ -236,6 +236,6 @@ test_expect_success \\\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:41\" \\\n-\t GIT_COMMITTER_DATE=\"2005-05-26 23:41\" git-commit -F M -a &&\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:41\" git commit -F M -a &&\n \t h_OTHER=$(git rev-parse --verify HEAD) &&\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:44\" \\\n-\t GIT_COMMITTER_DATE=\"2005-05-26 23:44\" git-commit --amend &&\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:44\" git commit --amend &&\n \t h_FIXED=$(git rev-parse --verify HEAD) &&\n@@ -244,3 +244,3 @@ test_expect_success \\\n \t GIT_AUTHOR_DATE=\"2005-05-26 23:45\" \\\n-\t GIT_COMMITTER_DATE=\"2005-05-26 23:45\" git-commit -F M &&\n+\t GIT_COMMITTER_DATE=\"2005-05-26 23:45\" git commit -F M &&\n \t h_MERGED=$(git rev-parse --verify HEAD) &&\n@@ -255,3 +255,3 @@ EOF\n test_expect_success \\\n-\t'git-commit logged updates' \\\n+\t'git commit logged updates' \\\n \t\"diff expect .git/logs/$m\"\ndiff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh\nindex 95244c9..cc65394 100755\n--- a/t/t1503-rev-parse-verify.sh\n+++ b/t/t1503-rev-parse-verify.sh\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/t2005-checkout-index-symlinks.sh b/t/t2005-checkout-index-symlinks.sh\nindex a84c5a6..ed12c4d 100755\n--- a/t/t2005-checkout-index-symlinks.sh\n+++ b/t/t2005-checkout-index-symlinks.sh\n@@ -15,3 +15,3 @@ test_expect_success \\\n git config core.symlinks false &&\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@@ -25,3 +25,3 @@ test_expect_success \\\n 'the file must be the blob we added during the setup' '\n-test \"$(git-hash-object -t blob symlink)\" = $l'\n+test \"$(git hash-object -t blob symlink)\" = $l'\n \ndiff --git a/t/t2050-git-dir-relative.sh b/t/t2050-git-dir-relative.sh\nindex 88f268b..b7131d8 100755\n--- a/t/t2050-git-dir-relative.sh\n+++ b/t/t2050-git-dir-relative.sh\n@@ -28,4 +28,4 @@ test_expect_success 'post-commit hook used ordinarily' '\n echo initial >top &&\n-git-add top\n-git-commit -m initial &&\n+git add top\n+git commit -m initial &&\n test -r \"${COMMIT_FILE}\"\ndiff --git a/t/t2101-update-index-reupdate.sh b/t/t2101-update-index-reupdate.sh\nindex 59b560b..648184f 100755\n--- a/t/t2101-update-index-reupdate.sh\n+++ b/t/t2101-update-index-reupdate.sh\n@@ -42,3 +42,3 @@ test_expect_success 'update-index --remove --again' \\\n \n-test_expect_success 'first commit' 'git-commit -m initial'\n+test_expect_success 'first commit' 'git commit -m initial'\n \ndiff --git a/t/t2102-update-index-symlinks.sh b/t/t2102-update-index-symlinks.sh\nindex 19d0894..f195aef 100755\n--- a/t/t2102-update-index-symlinks.sh\n+++ b/t/t2102-update-index-symlinks.sh\n@@ -15,3 +15,3 @@ test_expect_success \\\n git config core.symlinks false &&\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'\ndiff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh\nindex f57a6e0..cd9231c 100755\n--- a/t/t2200-add-update.sh\n+++ b/t/t2200-add-update.sh\n@@ -28,3 +28,3 @@ test_expect_success setup '\n \ttest_tick\n-\tgit-commit -m initial &&\n+\tgit commit -m initial &&\n \n@@ -42,3 +42,3 @@ test_expect_success update '\n test_expect_success 'update noticed a removal' '\n-\ttest \"$(git-ls-files dir1/sub1)\" = \"\"\n+\ttest \"$(git ls-files dir1/sub1)\" = \"\"\n '\n@@ -46,3 +46,3 @@ test_expect_success 'update noticed a removal' '\n test_expect_success 'update touched correct path' '\n-\ttest \"$(git-diff-files --name-status dir2/sub3)\" = \"\"\n+\ttest \"$(git diff-files --name-status dir2/sub3)\" = \"\"\n '\n@@ -50,4 +50,4 @@ test_expect_success 'update touched correct path' '\n test_expect_success 'update did not touch other tracked files' '\n-\ttest \"$(git-diff-files --name-status check)\" = \"M\tcheck\" &&\n-\ttest \"$(git-diff-files --name-status top)\" = \"M\ttop\"\n+\ttest \"$(git diff-files --name-status check)\" = \"M\tcheck\" &&\n+\ttest \"$(git diff-files --name-status top)\" = \"M\ttop\"\n '\n@@ -55,3 +55,3 @@ test_expect_success 'update did not touch other tracked files' '\n test_expect_success 'update did not touch untracked files' '\n-\ttest \"$(git-ls-files dir2/other)\" = \"\"\n+\ttest \"$(git ls-files dir2/other)\" = \"\"\n '\ndiff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh\nindex 1caeaca..8666946 100755\n--- a/t/t3001-ls-files-others-exclude.sh\n+++ b/t/t3001-ls-files-others-exclude.sh\n@@ -98,3 +98,3 @@ EOF\n \n-test_expect_success 'git-status honours core.excludesfile' \\\n+test_expect_success 'git status honors core.excludesfile' \\\n \t'test_cmp expect output'\ndiff --git a/t/t3020-ls-files-error-unmatch.sh b/t/t3020-ls-files-error-unmatch.sh\nindex af8c412..f4066cb 100755\n--- a/t/t3020-ls-files-error-unmatch.sh\n+++ b/t/t3020-ls-files-error-unmatch.sh\n@@ -15,3 +15,3 @@ touch foo bar\n git update-index --add foo bar\n-git-commit -m \"add foo bar\"\n+git commit -m \"add foo bar\"\n \ndiff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh\nindex f288015..de0cdb1 100755\n--- a/t/t3030-merge-recursive.sh\n+++ b/t/t3030-merge-recursive.sh\n@@ -243,3 +243,3 @@ test_expect_success 'merge-recursive simple' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c2\" \"$c1\"\n+\tgit merge-recursive \"$c0\" -- \"$c2\" \"$c1\"\n \tstatus=$?\n@@ -287,3 +287,3 @@ test_expect_success 'merge-recursive remove conflict' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c1\" \"$c5\"\n+\tgit merge-recursive \"$c0\" -- \"$c1\" \"$c5\"\n \tstatus=$?\n@@ -319,3 +319,3 @@ test_expect_success 'merge-recursive d/f simple' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c1\" \"$c3\"\n+\tgit merge-recursive \"$c0\" -- \"$c1\" \"$c3\"\n '\n@@ -341,3 +341,3 @@ test_expect_success 'merge-recursive d/f conflict' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c1\" \"$c4\"\n+\tgit merge-recursive \"$c0\" -- \"$c1\" \"$c4\"\n \tstatus=$?\n@@ -375,3 +375,3 @@ test_expect_success 'merge-recursive d/f conflict the other way' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c4\" \"$c1\"\n+\tgit merge-recursive \"$c0\" -- \"$c4\" \"$c1\"\n \tstatus=$?\n@@ -409,3 +409,3 @@ test_expect_success 'merge-recursive d/f conflict' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c1\" \"$c6\"\n+\tgit merge-recursive \"$c0\" -- \"$c1\" \"$c6\"\n \tstatus=$?\n@@ -443,3 +443,3 @@ test_expect_success 'merge-recursive d/f conflict' '\n \n-\tgit-merge-recursive \"$c0\" -- \"$c6\" \"$c1\"\n+\tgit merge-recursive \"$c0\" -- \"$c6\" \"$c1\"\n \tstatus=$?\ndiff --git a/t/t3200-branch.sh b/t/t3200-branch.sh\nindex 7a83fbf..2147eac 100755\n--- a/t/t3200-branch.sh\n+++ b/t/t3200-branch.sh\n@@ -16,6 +16,6 @@ test_expect_success \\\n      git update-index --add A &&\n-     git-commit -m \"Initial commit.\" &&\n+     git commit -m \"Initial commit.\" &&\n      echo World >> A &&\n      git update-index --add A &&\n-     git-commit -m \"Second commit.\" &&\n+     git commit -m \"Second commit.\" &&\n      HEAD=$(git rev-parse --verify HEAD)'\n@@ -125,3 +125,3 @@ test_expect_success 'test tracking setup via --track' \\\n      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n      git branch --track my1 local/master &&\n@@ -133,3 +133,3 @@ test_expect_success 'test tracking setup (non-wildcard, matching)' \\\n      git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&\n-     (git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n      git branch --track my4 local/master &&\n@@ -141,3 +141,3 @@ test_expect_success 'test tracking setup (non-wildcard, not matching)' \\\n      git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&\n-     (git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n      git branch --track my5 local/master &&\n@@ -150,3 +150,3 @@ test_expect_success 'test tracking setup via config' \\\n      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n      git branch my3 local/master &&\n@@ -159,3 +159,3 @@ test_expect_success 'test overriding tracking setup via --no-track' \\\n      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/master || git fetch local) &&\n      git branch --no-track my2 local/master &&\n@@ -175,3 +175,3 @@ test_expect_success 'test tracking setup via --track but deeper' \\\n      git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-     (git show-ref -q refs/remotes/local/o/o || git-fetch local) &&\n+     (git show-ref -q refs/remotes/local/o/o || git fetch local) &&\n      git branch --track my7 local/o/o &&\n@@ -211,3 +211,3 @@ test_expect_success \\\n \t'GIT_COMMITTER_DATE=\"2005-05-26 23:30\" \\\n-     git-checkout -b g/h/i -l master &&\n+     git checkout -b g/h/i -l master &&\n \t test -f .git/refs/heads/g/h/i &&\n@@ -230,3 +230,3 @@ test_expect_success 'autosetuprebase local on a tracked local branch' '\n \tgit config branch.autosetuprebase local &&\n-\t(git show-ref -q refs/remotes/local/o || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/o || git fetch local) &&\n \tgit branch mybase &&\n@@ -242,3 +242,3 @@ test_expect_success 'autosetuprebase always on a tracked local branch' '\n \tgit config branch.autosetuprebase always &&\n-\t(git show-ref -q refs/remotes/local/o || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/o || git fetch local) &&\n \tgit branch mybase2 &&\n@@ -254,3 +254,3 @@ test_expect_success 'autosetuprebase remote on a tracked local branch' '\n \tgit config branch.autosetuprebase remote &&\n-\t(git show-ref -q refs/remotes/local/o || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/o || git fetch local) &&\n \tgit branch mybase3 &&\n@@ -266,3 +266,3 @@ test_expect_success 'autosetuprebase never on a tracked local branch' '\n \tgit config branch.autosetuprebase never &&\n-\t(git show-ref -q refs/remotes/local/o || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/o || git fetch local) &&\n \tgit branch mybase4 &&\n@@ -278,3 +278,3 @@ test_expect_success 'autosetuprebase local on a tracked remote branch' '\n \tgit config branch.autosetuprebase local &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --track myr5 local/master &&\n@@ -289,3 +289,3 @@ test_expect_success 'autosetuprebase never on a tracked remote branch' '\n \tgit config branch.autosetuprebase never &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --track myr6 local/master &&\n@@ -300,3 +300,3 @@ test_expect_success 'autosetuprebase remote on a tracked remote branch' '\n \tgit config branch.autosetuprebase remote &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --track myr7 local/master &&\n@@ -311,3 +311,3 @@ test_expect_success 'autosetuprebase always on a tracked remote branch' '\n \tgit config branch.autosetuprebase remote &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --track myr8 local/master &&\n@@ -322,3 +322,3 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --track myr9 local/master &&\n@@ -332,3 +332,3 @@ test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/o || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/o || git fetch local) &&\n \tgit branch mybase10 &&\n@@ -343,3 +343,3 @@ test_expect_success 'autosetuprebase unconfigured on untracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr11 mybase2 &&\n@@ -353,3 +353,3 @@ test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr12 local/master &&\n@@ -364,3 +364,3 @@ test_expect_success 'autosetuprebase never on an untracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr13 mybase2 &&\n@@ -375,3 +375,3 @@ test_expect_success 'autosetuprebase local on an untracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr14 mybase2 &&\n@@ -386,3 +386,3 @@ test_expect_success 'autosetuprebase remote on an untracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr15 mybase2 &&\n@@ -397,3 +397,3 @@ test_expect_success 'autosetuprebase always on an untracked local branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr16 mybase2 &&\n@@ -408,3 +408,3 @@ test_expect_success 'autosetuprebase never on an untracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr17 local/master &&\n@@ -419,3 +419,3 @@ test_expect_success 'autosetuprebase local on an untracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr18 local/master &&\n@@ -430,3 +430,3 @@ test_expect_success 'autosetuprebase remote on an untracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr19 local/master &&\n@@ -441,3 +441,3 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' '\n \tgit config remote.local.fetch refs/heads/*:refs/remotes/local/* &&\n-\t(git show-ref -q refs/remotes/local/master || git-fetch local) &&\n+\t(git show-ref -q refs/remotes/local/master || git fetch local) &&\n \tgit branch --no-track myr20 local/master &&\ndiff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh\nindex c2dec1c..087ef75 100755\n--- a/t/t3210-pack-refs.sh\n+++ b/t/t3210-pack-refs.sh\n@@ -19,3 +19,3 @@ test_expect_success \\\n      git update-index --add A &&\n-     git-commit -m \"Initial commit.\" &&\n+     git commit -m \"Initial commit.\" &&\n      HEAD=$(git rev-parse --verify HEAD)'\n@@ -99,3 +99,3 @@ test_expect_success \\\n test_expect_success 'pack, prune and repack' '\n-\tgit-tag foo &&\n+\tgit tag foo &&\n \tgit pack-refs --all --prune &&\ndiff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh\nindex 91bb5e1..b7a670e 100755\n--- a/t/t3400-rebase.sh\n+++ b/t/t3400-rebase.sh\n@@ -18,3 +18,3 @@ test_expect_success \\\n      git update-index --add A &&\n-     git-commit -m \"Add A.\" &&\n+     git commit -m \"Add A.\" &&\n      git checkout -b my-topic-branch &&\n@@ -22,3 +22,3 @@ test_expect_success \\\n      git update-index --add B &&\n-     git-commit -m \"Add B.\" &&\n+     git commit -m \"Add B.\" &&\n      git checkout -f master &&\n@@ -26,3 +26,3 @@ test_expect_success \\\n      git update-index A &&\n-     git-commit -m \"Modify A.\" &&\n+     git commit -m \"Modify A.\" &&\n      git checkout -b side my-topic-branch &&\ndiff --git a/t/t3401-rebase-partial.sh b/t/t3401-rebase-partial.sh\nindex 166ddb1..aea6685 100755\n--- a/t/t3401-rebase-partial.sh\n+++ b/t/t3401-rebase-partial.sh\n@@ -17,5 +17,5 @@ test_expect_success \\\n      git update-index --add A &&\n-     git-commit -m \"Add A.\" &&\n+     git commit -m \"Add A.\" &&\n \n-     git-checkout -b my-topic-branch &&\n+     git checkout -b my-topic-branch &&\n \n@@ -23,3 +23,3 @@ test_expect_success \\\n      git update-index --add B &&\n-     git-commit -m \"Add B.\" &&\n+     git commit -m \"Add B.\" &&\n \n@@ -27,5 +27,5 @@ test_expect_success \\\n      git update-index --add C &&\n-     git-commit -m \"Add C.\" &&\n+     git commit -m \"Add C.\" &&\n \n-     git-checkout -f master &&\n+     git checkout -f master &&\n \n@@ -33,3 +33,3 @@ test_expect_success \\\n      git update-index A &&\n-     git-commit -m \"Modify A.\"\n+     git commit -m \"Modify A.\"\n '\n@@ -39,3 +39,3 @@ test_expect_success \\\n     'git cherry-pick my-topic-branch^0 &&\n-     git-checkout -f my-topic-branch &&\n+     git checkout -f my-topic-branch &&\n      git branch master-merge master &&\n@@ -51,4 +51,4 @@ test_debug \\\n test_expect_success \\\n-    'rebase topic branch against new master and check git-am did not get halted' \\\n-    'git-rebase master && test ! -d .git/rebase-apply'\n+    'rebase topic branch against new master and check git am did not get halted' \\\n+    'git rebase master && test ! -d .git/rebase-apply'\n \n@@ -56,4 +56,4 @@ test_expect_success \\\n \t'rebase --merge topic branch that was partially merged upstream' \\\n-\t'git-checkout -f my-topic-branch-merge &&\n-\t git-rebase --merge master-merge &&\n+\t'git checkout -f my-topic-branch-merge &&\n+\t git rebase --merge master-merge &&\n \t test ! -d .git/rebase-merge'\ndiff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh\nindex 0d33c71..64446e3 100755\n--- a/t/t3403-rebase-skip.sh\n+++ b/t/t3403-rebase-skip.sh\n@@ -9,3 +9,3 @@ test_description='git rebase --merge --skip tests'\n \n-# we assume the default git-am -3 --skip strategy is tested independently\n+# we assume the default git am -3 --skip strategy is tested independently\n # and always works :)\ndiff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh\nindex 5aa487a..e0ded19 100755\n--- a/t/t3404-rebase-interactive.sh\n+++ b/t/t3404-rebase-interactive.sh\n@@ -163,3 +163,3 @@ test_expect_success 'stop on conflicting pick' '\n \ttest_cmp expect2 file1 &&\n-\ttest \"$(git-diff --name-status |\n+\ttest \"$(git diff --name-status |\n \t\tsed -n -e \"/^U/s/^U[^a-z]*//p\")\" = file1 &&\ndiff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh\nindex 4de550a..2999e78 100755\n--- a/t/t3407-rebase-abort.sh\n+++ b/t/t3407-rebase-abort.sh\n@@ -54,3 +54,3 @@ testrebase() {\n \t\ttest $(git rev-parse HEAD) = $(git rev-parse master) &&\n-\t\tgit-rebase --abort &&\n+\t\tgit rebase --abort &&\n \t\ttest $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&\ndiff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh\nindex 4911c48..dadbbc2 100755\n--- a/t/t3500-cherry.sh\n+++ b/t/t3500-cherry.sh\n@@ -19,5 +19,5 @@ test_expect_success \\\n      git update-index --add A &&\n-     git-commit -m \"Add A.\" &&\n+     git commit -m \"Add A.\" &&\n \n-     git-checkout -b my-topic-branch &&\n+     git checkout -b my-topic-branch &&\n \n@@ -25,3 +25,3 @@ test_expect_success \\\n      git update-index --add B &&\n-     git-commit -m \"Add B.\" &&\n+     git commit -m \"Add B.\" &&\n \n@@ -30,5 +30,5 @@ test_expect_success \\\n      git update-index --add C &&\n-     git-commit -m \"Add C.\" &&\n+     git commit -m \"Add C.\" &&\n \n-     git-checkout -f master &&\n+     git checkout -f master &&\n      rm -f B C &&\n@@ -37,3 +37,3 @@ test_expect_success \\\n      git update-index A &&\n-     git-commit -m \"Modify A.\" &&\n+     git commit -m \"Modify A.\" &&\n \ndiff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh\nindex c851db8..6fb027b 100755\n--- a/t/t3800-mktag.sh\n+++ b/t/t3800-mktag.sh\n@@ -4,3 +4,3 @@\n \n-test_description='git-mktag: tag object verify test'\n+test_description='git mktag: tag object verify test'\n \n@@ -16,3 +16,3 @@ check_verify_failure () {\n \ttest_expect_success \"$1\" '\n-\t\t( test_must_fail git-mktag <tag.sig 2>message ) &&\n+\t\t( test_must_fail git mktag <tag.sig 2>message ) &&\n \t\tgrep \"$expect\" message\n@@ -26,3 +26,3 @@ echo Hello >A\n git update-index --add A\n-git-commit -m \"Initial commit\"\n+git commit -m \"Initial commit\"\n head=$(git rev-parse --verify HEAD)\n@@ -224,3 +224,3 @@ test_expect_success \\\n     'allow empty tag email' \\\n-    'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'\n+    'git mktag <tag.sig >.git/refs/tags/mytag 2>message'\n \n@@ -352,3 +352,3 @@ test_expect_success \\\n     'create valid tag' \\\n-    'git-mktag <tag.sig >.git/refs/tags/mytag 2>message'\n+    'git mktag <tag.sig >.git/refs/tags/mytag 2>message'\n \n@@ -359,3 +359,3 @@ test_expect_success \\\n     'check mytag' \\\n-    'git-tag -l | grep mytag'\n+    'git tag -l | grep mytag'\n \ndiff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh\nindex f4f4184..784c31a 100755\n--- a/t/t3900-i18n-commit.sh\n+++ b/t/t3900-i18n-commit.sh\n@@ -20,3 +20,3 @@ test_expect_success setup '\n \tgit update-ref HEAD $C &&\n-\tgit-tag C0\n+\tgit tag C0\n '\n@@ -32,5 +32,5 @@ do\n \t\tgit config i18n.commitencoding $H &&\n-\t\tgit-checkout -b $H C0 &&\n+\t\tgit checkout -b $H C0 &&\n \t\techo $H >F &&\n-\t\tgit-commit -a -F \"$TEST_DIRECTORY\"/t3900/$H.txt\n+\t\tgit commit -a -F \"$TEST_DIRECTORY\"/t3900/$H.txt\n \t'\ndiff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh\nindex f68ff53..7655da3 100755\n--- a/t/t3901-i18n-patch.sh\n+++ b/t/t3901-i18n-patch.sh\n@@ -105,3 +105,3 @@ test_expect_success 'rebase (U/U)' '\n \tgit checkout -b test &&\n-\tgit-rebase master &&\n+\tgit rebase master &&\n \n@@ -116,3 +116,3 @@ test_expect_success 'rebase (U/L)' '\n \tgit reset --hard side &&\n-\tgit-rebase master &&\n+\tgit rebase master &&\n \n@@ -128,3 +128,3 @@ test_expect_success 'rebase (L/L)' '\n \tgit reset --hard side &&\n-\tgit-rebase master &&\n+\tgit rebase master &&\n \n@@ -141,3 +141,3 @@ test_expect_success 'rebase (L/U)' '\n \tgit reset --hard side &&\n-\tgit-rebase master &&\n+\tgit rebase master &&\n \n@@ -213,3 +213,3 @@ test_expect_success 'rebase --merge (U/U)' '\n \tgit reset --hard side &&\n-\tgit-rebase --merge master &&\n+\tgit rebase --merge master &&\n \n@@ -224,3 +224,3 @@ test_expect_success 'rebase --merge (U/L)' '\n \tgit reset --hard side &&\n-\tgit-rebase --merge master &&\n+\tgit rebase --merge master &&\n \n@@ -236,3 +236,3 @@ test_expect_success 'rebase --merge (L/L)' '\n \tgit reset --hard side &&\n-\tgit-rebase --merge master &&\n+\tgit rebase --merge master &&\n \n@@ -249,3 +249,3 @@ test_expect_success 'rebase --merge (L/U)' '\n \tgit reset --hard side &&\n-\tgit-rebase --merge master &&\n+\tgit rebase --merge master &&\n \ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 8d4804b..7484cbe 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -5,3 +5,3 @@\n \n-test_description='Test git-stash'\n+test_description='Test git stash'\n \n-- \n1.6.0.1\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"}]}