tests: use "git foo" without dash in strings

This changes "git-foo" to "git foo" when message strings in tests
name git subcommands.

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

diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index de9b6ed5ba0d1753bbc45386bb3d4fe487ccc725..52a451dd5782ab584ba34e73abaef32d5e332537 100755 (executable)
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

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

 
 Testing a custom strategy.'
 
 
 Testing a custom strategy.'
 

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 5ade88d47968a6d7bebf103f8c30d3a10722817d..9b238c329b87d98dca4d0e66839df97c5c3a0673 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -20,7 +20,7 @@ esac
 say 'define NO_SVN_TESTS to skip git svn tests'
 
 test_expect_success \
 say 'define NO_SVN_TESTS to skip git svn tests'
 
 test_expect_success \

-    'initialize git-svn' '
+    'initialize git svn' '

        mkdir import &&
        cd import &&
        echo foo > foo &&
        mkdir import &&
        cd import &&
        echo foo > foo &&


@@ -31,7 +31,7 @@ test_expect_success \
        echo "zzz" > bar/zzz &&
        echo "#!/bin/sh" > exec.sh &&
        chmod +x exec.sh &&
        echo "zzz" > bar/zzz &&
        echo "#!/bin/sh" > exec.sh &&
        chmod +x exec.sh &&

-       svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
+       svn import -m "import for git svn" . "$svnrepo" >/dev/null &&

        cd .. &&
        rm -rf import &&
        git svn init "$svnrepo"'
        cd .. &&
        rm -rf import &&
        git svn init "$svnrepo"'

diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 0d48b2619b577d897a90309c9578718fa3004057..7732dea3942e33a04bea7e4badc9cbb85267bc18 100755 (executable)
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -48,7 +48,7 @@ EOF
        printf "\r\n" > empty_crlf
        a_empty_crlf=`git-hash-object -w empty_crlf`
 
        printf "\r\n" > empty_crlf
        a_empty_crlf=`git-hash-object -w empty_crlf`
 

-       svn import --no-auto-props -m 'import for git-svn' . "$svnrepo" >/dev/null
+       svn import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null

 cd ..
 
 rm -rf import
 cd ..
 
 rm -rf import


@@ -66,7 +66,7 @@ test_expect_success 'setup some commits to svn' \
                svn commit -m "Propset Id" &&
        cd ..'
 
                svn commit -m "Propset Id" &&
        cd ..'
 

-test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
+test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'

 test_expect_success 'fetch revisions from svn' 'git svn fetch'
 
 name='test svn:keywords ignoring'
 test_expect_success 'fetch revisions from svn' 'git svn fetch'
 
 name='test svn:keywords ignoring'

diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index ea5a385cade0b4a3329a26654fd6761a5e7a9037..e2232180158cfb0e523c8ffdd3ac10bf61c8f4ee 100755 (executable)
--- a/t/t9102-git-svn-deep-rmdir.sh
+++ b/t/t9102-git-svn-deep-rmdir.sh
@@ -9,11 +9,11 @@ test_expect_success 'initialize repo' '
        mkdir -p deeply/nested/directory/number/2 &&
        echo foo > deeply/nested/directory/number/1/file &&
        echo foo > deeply/nested/directory/number/2/another &&
        mkdir -p deeply/nested/directory/number/2 &&
        echo foo > deeply/nested/directory/number/1/file &&
        echo foo > deeply/nested/directory/number/2/another &&

-       svn import -m "import for git-svn" . "$svnrepo" &&
+       svn import -m "import for git svn" . "$svnrepo" &&

        cd ..
        '
 
        cd ..
        '
 

-test_expect_success 'mirror via git-svn' '
+test_expect_success 'mirror via git svn' '

        git svn init "$svnrepo" &&
        git svn fetch &&
        git checkout -f -b test-rmdir ${remotes_git_svn}
        git svn init "$svnrepo" &&
        git svn fetch &&
        git checkout -f -b test-rmdir ${remotes_git_svn}

diff --git a/t/t9112-git-svn-md5less-file.sh b/t/t9112-git-svn-md5less-file.sh
index 91b88cf2e22be27eee07ce1ad2a6c68970e734ff..a61d6716d294a460c195ca36d33a9bed17aa5e33 100755 (executable)
--- a/t/t9112-git-svn-md5less-file.sh
+++ b/t/t9112-git-svn-md5less-file.sh
@@ -42,6 +42,6 @@ EOF
 
 test_expect_success 'load svn dumpfile' 'svnadmin load "$rawsvnrepo" < dumpfile.svn'
 
 
 test_expect_success 'load svn dumpfile' 'svnadmin load "$rawsvnrepo" < dumpfile.svn'
 

-test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
+test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'

 test_expect_success 'fetch revisions from svn' 'git svn fetch'
 test_done
 test_expect_success 'fetch revisions from svn' 'git svn fetch'
 test_done

diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 1190576a658d08a680e177b748cfc5e69caa3ddb..1b1cf47281d10c64ac57e96701c727f19f189948 100755 (executable)
--- a/t/t9122-git-svn-author.sh
+++ b/t/t9122-git-svn-author.sh
@@ -13,7 +13,7 @@ test_expect_success 'setup svn repository' '
        )
 '
 
        )
 '
 

-test_expect_success 'interact with it via git-svn' '
+test_expect_success 'interact with it via git svn' '

        mkdir work.git &&
        (
                cd work.git &&
        mkdir work.git &&
        (
                cd work.git &&

diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index ddb1a481f79c14b8d72140b71058c4ef30ab7f05..cf0415274c2d2abae7a6850818f4de8063cb61a7 100755 (executable)
--- a/t/t9123-git-svn-rebuild-with-rewriteroot.sh
+++ b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
@@ -10,7 +10,7 @@ test_description='git svn respects rewriteRoot during rebuild'
 mkdir import
 cd import
        touch foo
 mkdir import
 cd import
        touch foo

-       svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
+       svn import -m 'import for git svn' . "$svnrepo" >/dev/null

 cd ..
 rm -rf import
 
 cd ..
 rm -rf import
 

diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh
index 0d7e7b2cf11f383b6b68f369fea2ddef4ae91ad7..263dbf5fc276ffa052096810f59565a851245b7f 100755 (executable)
--- a/t/t9124-git-svn-dcommit-auto-props.sh
+++ b/t/t9124-git-svn-dcommit-auto-props.sh
@@ -16,12 +16,12 @@ enable-auto-props=$1
 EOF
 }
 
 EOF
 }
 

-test_expect_success 'initialize git-svn' '
+test_expect_success 'initialize git svn' '

        mkdir import &&
        (
                cd import &&
                echo foo >foo &&
        mkdir import &&
        (
                cd import &&
                echo foo >foo &&

-               svn import -m "import for git-svn" . "$svnrepo"
+               svn import -m "import for git svn" . "$svnrepo"

        ) &&
        rm -rf import &&
        git svn init "$svnrepo"
        ) &&
        rm -rf import &&
        git svn init "$svnrepo"

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 0d7786a8c730d17fa194346f1da2978d23256da9..d2379e7f62a4da76791e65dbc2c70f4dfe14ff3b 100755 (executable)
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

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

 . ./test-lib.sh
 
 CVSROOT=$(pwd)/cvsroot
 . ./test-lib.sh
 
 CVSROOT=$(pwd)/cvsroot