tests: use "git xyzzy" form (t7200 - t9001)

Converts tests between t7201-t9001.

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

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 9ad5d635a2881c920fff8e524aea0ed931f68e6c..2e2b3bf53d75f587dd0823c8a82eaaf451c31607 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2006 Junio C Hamano
 #
 
 # Copyright (c) 2006 Junio C Hamano
 #
 

-test_description='git-checkout tests.
+test_description='git checkout tests.

 
 Creates master, forks renamer and side branches from it.
 Test switching across them.
 
 Creates master, forks renamer and side branches from it.
 Test switching across them.

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 2b51c0d7d8ab727a5fb0be8338938f1d3b2eb6a3..1636fac2a43e30a99674df98ff4544ee04612cc5 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Michael Spang
 #
 
 # Copyright (c) 2007 Michael Spang
 #
 

-test_description='git-clean basic tests'
+test_description='git clean basic tests'

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


@@ -16,17 +16,17 @@ test_expect_success 'setup' '
        echo build >.gitignore &&
        echo \*.o >>.gitignore &&
        git add . &&
        echo build >.gitignore &&
        echo \*.o >>.gitignore &&
        git add . &&

-       git-commit -m setup &&
+       git commit -m setup &&

        touch src/part2.c README &&
        git add .
 
 '
 
        touch src/part2.c README &&
        git add .
 
 '
 

-test_expect_success 'git-clean' '
+test_expect_success 'git clean' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean &&
+       git clean &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -39,11 +39,11 @@ test_expect_success 'git-clean' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean src/' '
+test_expect_success 'git clean src/' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean src/ &&
+       git clean src/ &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -56,11 +56,11 @@ test_expect_success 'git-clean src/' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean src/ src/' '
+test_expect_success 'git clean src/ src/' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean src/ src/ &&
+       git clean src/ src/ &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -73,11 +73,11 @@ test_expect_success 'git-clean src/ src/' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean with prefix' '
+test_expect_success 'git clean with prefix' '

 
        mkdir -p build docs src/test &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&
 
        mkdir -p build docs src/test &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so src/test/1.c &&

-       (cd src/ && git-clean) &&
+       (cd src/ && git clean) &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -91,7 +91,7 @@ test_expect_success 'git-clean with prefix' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean with relative prefix' '
+test_expect_success 'git clean with relative prefix' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&


@@ -106,7 +106,7 @@ test_expect_success 'git-clean with relative prefix' '
        }
 '
 
        }
 '
 

-test_expect_success 'git-clean with absolute path' '
+test_expect_success 'git clean with absolute path' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&


@@ -121,7 +121,7 @@ test_expect_success 'git-clean with absolute path' '
        }
 '
 
        }
 '
 

-test_expect_success 'git-clean with out of work tree relative path' '
+test_expect_success 'git clean with out of work tree relative path' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&


@@ -131,7 +131,7 @@ test_expect_success 'git-clean with out of work tree relative path' '
        )
 '
 
        )
 '
 

-test_expect_success 'git-clean with out of work tree absolute path' '
+test_expect_success 'git clean with out of work tree absolute path' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&


@@ -142,11 +142,11 @@ test_expect_success 'git-clean with out of work tree absolute path' '
        )
 '
 
        )
 '
 

-test_expect_success 'git-clean -d with prefix and path' '
+test_expect_success 'git clean -d with prefix and path' '

 
        mkdir -p build docs src/feature &&
        touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs src/feature &&
        touch a.out src/part3.c src/feature/file.c docs/manual.txt obj.o build/lib.so &&

-       (cd src/ && git-clean -d feature/) &&
+       (cd src/ && git clean -d feature/) &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -160,12 +160,12 @@ test_expect_success 'git-clean -d with prefix and path' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean symbolic link' '
+test_expect_success 'git clean symbolic link' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
        ln -s docs/manual.txt src/part4.c
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
        ln -s docs/manual.txt src/part4.c

-       git-clean &&
+       git clean &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -179,10 +179,10 @@ test_expect_success 'git-clean symbolic link' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean with wildcard' '
+test_expect_success 'git clean with wildcard' '

 
        touch a.clean b.clean other.c &&
 
        touch a.clean b.clean other.c &&

-       git-clean "*.clean" &&
+       git clean "*.clean" &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -193,11 +193,11 @@ test_expect_success 'git-clean with wildcard' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -n' '
+test_expect_success 'git clean -n' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -n &&
+       git clean -n &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -210,11 +210,11 @@ test_expect_success 'git-clean -n' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -d' '
+test_expect_success 'git clean -d' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -d &&
+       git clean -d &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -227,11 +227,11 @@ test_expect_success 'git-clean -d' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -d src/ examples/' '
+test_expect_success 'git clean -d src/ examples/' '

 
        mkdir -p build docs examples &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&
 
        mkdir -p build docs examples &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so examples/1.c &&

-       git-clean -d src/ examples/ &&
+       git clean -d src/ examples/ &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -245,11 +245,11 @@ test_expect_success 'git-clean -d src/ examples/' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -x' '
+test_expect_success 'git clean -x' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -x &&
+       git clean -x &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -262,11 +262,11 @@ test_expect_success 'git-clean -x' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -d -x' '
+test_expect_success 'git clean -d -x' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -d -x &&
+       git clean -d -x &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -279,11 +279,11 @@ test_expect_success 'git-clean -d -x' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -X' '
+test_expect_success 'git clean -X' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -X &&
+       git clean -X &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -296,11 +296,11 @@ test_expect_success 'git-clean -X' '
 
 '
 
 
 '
 

-test_expect_success 'git-clean -d -X' '
+test_expect_success 'git clean -d -X' '

 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -d -X &&
+       git clean -d -X &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -331,7 +331,7 @@ test_expect_success 'clean.requireForce and -n' '
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
 
        mkdir -p build docs &&
        touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&

-       git-clean -n &&
+       git clean -n &&

        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&
        test -f Makefile &&
        test -f README &&
        test -f src/part1.c &&


@@ -346,7 +346,7 @@ test_expect_success 'clean.requireForce and -n' '
 
 test_expect_success 'clean.requireForce and -f' '
 
 
 test_expect_success 'clean.requireForce and -f' '
 

-       git-clean -f &&
+       git clean -f &&

        test -f README &&
        test -f src/part1.c &&
        test -f src/part2.c &&
        test -f README &&
        test -f src/part1.c &&
        test -f src/part2.c &&

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index cbc0c34ce2487959ef0e8f89f7c2a5d4a68be826..be73f7b60ac0c8857cbe34c9e0bf8dd43a3dec39 100755 (executable)
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -6,7 +6,7 @@
 test_description='Basic porcelain support for submodules
 
 This test tries to verify basic sanity of the init, update and status
 test_description='Basic porcelain support for submodules
 
 This test tries to verify basic sanity of the init, update and status

-subcommands of git-submodule.
+subcommands of git submodule.

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


@@ -22,16 +22,16 @@ subcommands of git-submodule.
 #
 test_expect_success 'Prepare submodule testing' '
        : > t &&
 #
 test_expect_success 'Prepare submodule testing' '
        : > t &&

-       git-add t &&
-       git-commit -m "initial commit" &&
+       git add t &&
+       git commit -m "initial commit" &&

        git branch initial HEAD &&
        mkdir init &&
        cd init &&
        git init &&
        echo a >a &&
        git add a &&
        git branch initial HEAD &&
        mkdir init &&
        cd init &&
        git init &&
        echo a >a &&
        git add a &&

-       git-commit -m "submodule commit 1" &&
-       git-tag -a -m "rev-1" rev-1 &&
+       git commit -m "submodule commit 1" &&
+       git tag -a -m "rev-1" rev-1 &&

        rev1=$(git rev-parse HEAD) &&
        if test -z "$rev1"
        then
        rev1=$(git rev-parse HEAD) &&
        if test -z "$rev1"
        then


@@ -42,13 +42,13 @@ test_expect_success 'Prepare submodule testing' '
        echo a >a &&
        echo z >z &&
        git add a init z &&
        echo a >a &&
        echo z >z &&
        git add a init z &&

-       git-commit -m "super commit 1" &&
+       git commit -m "super commit 1" &&

        mv init .subrepo &&
        GIT_CONFIG=.gitmodules git config submodule.example.url git://example.com/init.git
 '
 
 test_expect_success 'status should fail for unmapped paths' '
        mv init .subrepo &&
        GIT_CONFIG=.gitmodules git config submodule.example.url git://example.com/init.git
 '
 
 test_expect_success 'status should fail for unmapped paths' '

-       if git-submodule status
+       if git submodule status

        then
                echo "[OOPS] submodule status succeeded"
                false
        then
                echo "[OOPS] submodule status succeeded"
                false


@@ -60,16 +60,16 @@ test_expect_success 'status should fail for unmapped paths' '
 '
 
 test_expect_success 'status should only print one line' '
 '
 
 test_expect_success 'status should only print one line' '

-       lines=$(git-submodule status | wc -l) &&
+       lines=$(git submodule status | wc -l) &&

        test $lines = 1
 '
 
 test_expect_success 'status should initially be "missing"' '
        test $lines = 1
 '
 
 test_expect_success 'status should initially be "missing"' '

-       git-submodule status | grep "^-$rev1"
+       git submodule status | grep "^-$rev1"

 '
 
 test_expect_success 'init should register submodule url in .git/config' '
 '
 
 test_expect_success 'init should register submodule url in .git/config' '

-       git-submodule init &&
+       git submodule init &&

        url=$(git config submodule.example.url) &&
        if test "$url" != "git://example.com/init.git"
        then
        url=$(git config submodule.example.url) &&
        if test "$url" != "git://example.com/init.git"
        then


@@ -84,7 +84,7 @@ test_expect_success 'init should register submodule url in .git/config' '
 
 test_expect_success 'update should fail when path is used by a file' '
        echo "hello" >init &&
 
 test_expect_success 'update should fail when path is used by a file' '
        echo "hello" >init &&

-       if git-submodule update
+       if git submodule update

        then
                echo "[OOPS] update should have failed"
                false
        then
                echo "[OOPS] update should have failed"
                false


@@ -100,7 +100,7 @@ test_expect_success 'update should fail when path is used by a file' '
 test_expect_success 'update should fail when path is used by a nonempty directory' '
        mkdir init &&
        echo "hello" >init/a &&
 test_expect_success 'update should fail when path is used by a nonempty directory' '
        mkdir init &&
        echo "hello" >init/a &&

-       if git-submodule update
+       if git submodule update

        then
                echo "[OOPS] update should have failed"
                false
        then
                echo "[OOPS] update should have failed"
                false


@@ -116,7 +116,7 @@ test_expect_success 'update should fail when path is used by a nonempty director
 test_expect_success 'update should work when path is an empty dir' '
        rm -rf init &&
        mkdir init &&
 test_expect_success 'update should work when path is an empty dir' '
        rm -rf init &&
        mkdir init &&

-       git-submodule update &&
+       git submodule update &&

        head=$(cd init && git rev-parse HEAD) &&
        if test -z "$head"
        then
        head=$(cd init && git rev-parse HEAD) &&
        if test -z "$head"
        then


@@ -130,14 +130,14 @@ test_expect_success 'update should work when path is an empty dir' '
 '
 
 test_expect_success 'status should be "up-to-date" after update' '
 '
 
 test_expect_success 'status should be "up-to-date" after update' '

-       git-submodule status | grep "^ $rev1"
+       git submodule status | grep "^ $rev1"

 '
 
 test_expect_success 'status should be "modified" after submodule commit' '
        cd init &&
        echo b >b &&
        git add b &&
 '
 
 test_expect_success 'status should be "modified" after submodule commit' '
        cd init &&
        echo b >b &&
        git add b &&

-       git-commit -m "submodule commit 2" &&
+       git commit -m "submodule commit 2" &&

        rev2=$(git rev-parse HEAD) &&
        cd .. &&
        if test -z "$rev2"
        rev2=$(git rev-parse HEAD) &&
        cd .. &&
        if test -z "$rev2"


@@ -145,19 +145,19 @@ test_expect_success 'status should be "modified" after submodule commit' '
                echo "[OOPS] submodule git rev-parse returned nothing"
                false
        fi &&
                echo "[OOPS] submodule git rev-parse returned nothing"
                false
        fi &&

-       git-submodule status | grep "^+$rev2"
+       git submodule status | grep "^+$rev2"

 '
 
 test_expect_success 'the --cached sha1 should be rev1' '
 '
 
 test_expect_success 'the --cached sha1 should be rev1' '

-       git-submodule --cached status | grep "^+$rev1"
+       git submodule --cached status | grep "^+$rev1"

 '
 
 test_expect_success 'git diff should report the SHA1 of the new submodule commit' '
 '
 
 test_expect_success 'git diff should report the SHA1 of the new submodule commit' '

-       git-diff | grep "^+Subproject commit $rev2"
+       git diff | grep "^+Subproject commit $rev2"

 '
 
 test_expect_success 'update should checkout rev1' '
 '
 
 test_expect_success 'update should checkout rev1' '

-       git-submodule update init &&
+       git submodule update init &&

        head=$(cd init && git rev-parse HEAD) &&
        if test -z "$head"
        then
        head=$(cd init && git rev-parse HEAD) &&
        if test -z "$head"
        then


@@ -171,12 +171,12 @@ test_expect_success 'update should checkout rev1' '
 '
 
 test_expect_success 'status should be "up-to-date" after update' '
 '
 
 test_expect_success 'status should be "up-to-date" after update' '

-       git-submodule status | grep "^ $rev1"
+       git submodule status | grep "^ $rev1"

 '
 
 test_expect_success 'checkout superproject with subproject already present' '
 '
 
 test_expect_success 'checkout superproject with subproject already present' '

-       git-checkout initial &&
-       git-checkout master
+       git checkout initial &&
+       git checkout master

 '
 
 test_expect_success 'apply submodule diff' '
 '
 
 test_expect_success 'apply submodule diff' '


@@ -188,8 +188,8 @@ test_expect_success 'apply submodule diff' '
                git commit -m "change subproject"
        ) &&
        git update-index --add init &&
                git commit -m "change subproject"
        ) &&
        git update-index --add init &&

-       git-commit -m "change init" &&
-       git-format-patch -1 --stdout >P.diff &&
+       git commit -m "change init" &&
+       git format-patch -1 --stdout >P.diff &&

        git checkout second &&
        git apply --index P.diff &&
        D=$(git diff --cached master) &&
        git checkout second &&
        git apply --index P.diff &&
        D=$(git diff --cached master) &&

diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index bf12dbdeef6e307850a91eb6be5ebe537b2de0c8..61498293b99e1cbbb4bfb4de45b6d14488aaddd0 100755 (executable)
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -5,7 +5,7 @@
 
 test_description='Summary support for submodules
 
 
 test_description='Summary support for submodules
 

-This test tries to verify the sanity of summary subcommand of git-submodule.
+This test tries to verify the sanity of summary subcommand of git submodule.

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

diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 809bdba6309c57f149b6c7f3dc3f4e147f9eb24b..0fe745ea0dbfda5e72ee9ef1df0b32245812e268 100755 (executable)
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Steven Grimm
 #
 
 # Copyright (c) 2007 Steven Grimm
 #
 

-test_description='git-commit
+test_description='git commit

 
 Tests for selected commit options.'
 
 
 Tests for selected commit options.'
 

diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index 0edd9ddf73b7053c21595ce1ac1dd157c77d1bca..469bff8873534e247205926dfb4919800457ca1e 100755 (executable)
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh
@@ -6,7 +6,7 @@
 # FIXME: Test the various index usages, -i and -o, test reflog,
 # signoff
 
 # FIXME: Test the various index usages, -i and -o, test reflog,
 # signoff
 

-test_description='git-commit'
+test_description='git commit'

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


@@ -14,52 +14,52 @@ test_tick
 test_expect_success \
        "initial status" \
        "echo 'bongo bongo' >file &&
 test_expect_success \
        "initial status" \
        "echo 'bongo bongo' >file &&

-        git-add file && \
-        git-status | grep 'Initial commit'"
+        git add file && \
+        git status | grep 'Initial commit'"

 
 test_expect_success \
        "fail initial amend" \
 
 test_expect_success \
        "fail initial amend" \

-       "test_must_fail git-commit --amend"
+       "test_must_fail git commit --amend"

 
 test_expect_success \
        "initial commit" \
 
 test_expect_success \
        "initial commit" \

-       "git-commit -m initial"
+       "git commit -m initial"

 
 test_expect_success \
        "invalid options 1" \
 
 test_expect_success \
        "invalid options 1" \

-       "test_must_fail git-commit -m foo -m bar -F file"
+       "test_must_fail git commit -m foo -m bar -F file"

 
 test_expect_success \
        "invalid options 2" \
 
 test_expect_success \
        "invalid options 2" \

-       "test_must_fail git-commit -C HEAD -m illegal"
+       "test_must_fail git commit -C HEAD -m illegal"

 
 test_expect_success \
        "using paths with -a" \
        "echo King of the bongo >file &&
 
 test_expect_success \
        "using paths with -a" \
        "echo King of the bongo >file &&

-       test_must_fail git-commit -m foo -a file"
+       test_must_fail git commit -m foo -a file"

 
 test_expect_success \
        "using paths with --interactive" \
        "echo bong-o-bong >file &&
 
 test_expect_success \
        "using paths with --interactive" \
        "echo bong-o-bong >file &&

-       ! (echo 7 | git-commit -m foo --interactive file)"
+       ! (echo 7 | git commit -m foo --interactive file)"

 
 test_expect_success \
        "using invalid commit with -C" \
 
 test_expect_success \
        "using invalid commit with -C" \

-       "test_must_fail git-commit -C bogus"
+       "test_must_fail git commit -C bogus"

 
 test_expect_success \
        "testing nothing to commit" \
 
 test_expect_success \
        "testing nothing to commit" \

-       "test_must_fail git-commit -m initial"
+       "test_must_fail git commit -m initial"

 
 test_expect_success \
        "next commit" \
        "echo 'bongo bongo bongo' >file \
 
 test_expect_success \
        "next commit" \
        "echo 'bongo bongo bongo' >file \

-        git-commit -m next -a"
+        git commit -m next -a"

 
 test_expect_success \
        "commit message from non-existing file" \
        "echo 'more bongo: bongo bongo bongo bongo' >file && \
 
 test_expect_success \
        "commit message from non-existing file" \
        "echo 'more bongo: bongo bongo bongo bongo' >file && \

-        test_must_fail git-commit -F gah -a"
+        test_must_fail git commit -F gah -a"

 
 # Empty except stray tabs and spaces on a few lines.
 sed -e 's/@$//' >msg <<EOF
 
 # Empty except stray tabs and spaces on a few lines.
 sed -e 's/@$//' >msg <<EOF


@@ -70,12 +70,12 @@ Signed-off-by: hula
 EOF
 test_expect_success \
        "empty commit message" \
 EOF
 test_expect_success \
        "empty commit message" \

-       "test_must_fail git-commit -F msg -a"
+       "test_must_fail git commit -F msg -a"

 
 test_expect_success \
        "commit message from file" \
        "echo 'this is the commit message, coming from a file' >msg && \
 
 test_expect_success \
        "commit message from file" \
        "echo 'this is the commit message, coming from a file' >msg && \

-        git-commit -F msg -a"
+        git commit -F msg -a"

 
 cat >editor <<\EOF
 #!/bin/sh
 
 cat >editor <<\EOF
 #!/bin/sh


@@ -86,16 +86,16 @@ chmod 755 editor
 
 test_expect_success \
        "amend commit" \
 
 test_expect_success \
        "amend commit" \

-       "VISUAL=./editor git-commit --amend"
+       "VISUAL=./editor git commit --amend"

 
 test_expect_success \
        "passing -m and -F" \
        "echo 'enough with the bongos' >file && \
 
 test_expect_success \
        "passing -m and -F" \
        "echo 'enough with the bongos' >file && \

-        test_must_fail git-commit -F msg -m amending ."
+        test_must_fail git commit -F msg -m amending ."

 
 test_expect_success \
        "using message from other commit" \
 
 test_expect_success \
        "using message from other commit" \

-       "git-commit -C HEAD^ ."
+       "git commit -C HEAD^ ."

 
 cat >editor <<\EOF
 #!/bin/sh
 
 cat >editor <<\EOF
 #!/bin/sh


@@ -107,25 +107,25 @@ chmod 755 editor
 test_expect_success \
        "editing message from other commit" \
        "echo 'hula hula' >file && \
 test_expect_success \
        "editing message from other commit" \
        "echo 'hula hula' >file && \

-        VISUAL=./editor git-commit -c HEAD^ -a"
+        VISUAL=./editor git commit -c HEAD^ -a"

 
 test_expect_success \
        "message from stdin" \
        "echo 'silly new contents' >file && \
 
 test_expect_success \
        "message from stdin" \
        "echo 'silly new contents' >file && \

-        echo commit message from stdin | git-commit -F - -a"
+        echo commit message from stdin | git commit -F - -a"

 
 test_expect_success \
        "overriding author from command line" \
        "echo 'gak' >file && \
 
 test_expect_success \
        "overriding author from command line" \
        "echo 'gak' >file && \

-        git-commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"
+        git commit -m 'author' --author 'Rubber Duck <rduck@convoy.org>' -a"

 
 test_expect_success \
        "interactive add" \
 
 test_expect_success \
        "interactive add" \

-       "echo 7 | git-commit --interactive | grep 'What now'"
+       "echo 7 | git commit --interactive | grep 'What now'"

 
 test_expect_success \
        "showing committed revisions" \
 
 test_expect_success \
        "showing committed revisions" \

-       "git-rev-list HEAD >current"
+       "git rev-list HEAD >current"

 
 # We could just check the head sha1, but checking each commit makes it
 # easier to isolate bugs.
 
 # We could just check the head sha1, but checking each commit makes it
 # easier to isolate bugs.


@@ -140,7 +140,7 @@ d381ac431806e53f3dd7ac2f1ae0534f36d738b9
 EOF
 
 test_expect_success \
 EOF
 
 test_expect_success \

-    'validate git-rev-list output.' \
+    'validate git rev-list output.' \

     'diff current expected'
 
 test_expect_success 'partial commit that involves removal (1)' '
     'diff current expected'
 
 test_expect_success 'partial commit that involves removal (1)' '

diff --git a/t/t7502-status.sh b/t/t7502-status.sh
index 38a48b57c70a888838cfa114be843e1d4aea00d8..c8e4c2e7b452c5e8db3958a85195c8cc5f6918f5 100755 (executable)
--- a/t/t7502-status.sh
+++ b/t/t7502-status.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Johannes E. Schindelin
 #
 
 # Copyright (c) 2007 Johannes E. Schindelin
 #
 

-test_description='git-status'
+test_description='git status'

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

diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index cd6c7c834218fd4c46c49396b79da1ddeef42772..ff189624d48fb9f68997395d121d4e7056511245 100755 (executable)
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -32,7 +32,7 @@ echo "#!$SHELL_PATH" > "$HOOK"
 cat >> "$HOOK" <<'EOF'
 
 if test "$2" = commit; then
 cat >> "$HOOK" <<'EOF'
 
 if test "$2" = commit; then

-  source=$(git-rev-parse "$3")
+  source=$(git rev-parse "$3")

 else
   source=${2-default}
 fi
 else
   source=${2-default}
 fi

diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index a75130cdbb55be157c915f4fc1397227a78441ec..d9a08aac56f8edf002a126cba83172abf5015034 100755 (executable)
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-status for submodule'
+test_description='git status for submodule'

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

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index dbc90bc41625fccb4119cd6c2fc49668fe784122..94bc556cb2ad5dd56be2aaed82cec8e2edde7265 100755 (executable)
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2007 Lars Hjemli
 #
 
 # Copyright (c) 2007 Lars Hjemli
 #
 

-test_description='git-merge
+test_description='git merge

 
 Testing basic merge operations/option parsing.'
 
 
 Testing basic merge operations/option parsing.'
 

diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index 55aa6b5f2716255b2b5aa74f1cac9d285de6d6a8..7ba94ea99bc0785da5b398e494d23469ba44992d 100755 (executable)
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-merge
+test_description='git merge

 
 Testing pull.* configuration parsing.'
 
 
 Testing pull.* configuration parsing.'
 

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index fcb8285746420ed721713d9c8e527d23cafb05cf..01e5415e943f3e16154f2f4d999f85a9d8b6ae49 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-merge
+test_description='git merge

 
 Testing octopus merge with more than 25 refs.'
 
 
 Testing octopus merge with more than 25 refs.'
 

diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
index 17b19dc11f2b1a5d26a16f447733880f3cf30d26..b47b7b9757dffe2d3d41127b43ffa929505c0e77 100755 (executable)
--- a/t/t7603-merge-reduce-heads.sh
+++ b/t/t7603-merge-reduce-heads.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-merge
+test_description='git merge

 
 Testing octopus merge when reducing parents to independent branches.'
 
 
 Testing octopus merge when reducing parents to independent branches.'
 

diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index 6081677d234f1fcb88b6b9160f707ebf0274f38a..de977c5e2f0b270c57bbea9daaf8e22eefdf8560 100755 (executable)
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-merge
+test_description='git merge

 
 Testing merge when using a custom message for the merge commit.'
 
 
 Testing merge when using a custom message for the merge commit.'
 

diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index f1f86ddb2381ce70e6845298e86ed96d6399fdf9..0cb9d11f2171de19b260391017310f0ee792f89b 100755 (executable)
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-merge
+test_description='git merge

 
 Testing the resolve strategy.'
 
 
 Testing the resolve strategy.'
 

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 9285071c473dcfe7d37845d01ba20226b5ab585d..09fa5f115c9fabe1fec60a5597439b2c7f9ded6d 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2008 Charles Bailey
 #
 
 # Copyright (c) 2008 Charles Bailey
 #
 

-test_description='git-mergetool
+test_description='git mergetool

 
 Testing basic merge tool invocation'
 
 
 Testing basic merge tool invocation'
 

diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh
index 31c340fd389ed2688bb94a29acbf892be6f0c564..531dac060a761f3383b3bee15444345a66e2f13b 100755 (executable)
--- a/t/t7701-repack-unpack-unreachable.sh
+++ b/t/t7701-repack-unpack-unreachable.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-repack works correctly'
+test_description='git repack works correctly'

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

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1c857cf4ab6e359d7009d2c6b5018bb61c916e93..d098a01ba30fa08ae696085164e7b77453f8715a 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-test_description='git-send-email'
+test_description='git send-email'

 . ./test-lib.sh
 
 PROG='git send-email'
 . ./test-lib.sh
 
 PROG='git send-email'