summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xt/t7606-merge-custom.sh2
-rwxr-xr-xt/t9100-git-svn-basic.sh4
-rwxr-xr-xt/t9101-git-svn-props.sh4
-rwxr-xr-xt/t9102-git-svn-deep-rmdir.sh4
-rwxr-xr-xt/t9112-git-svn-md5less-file.sh2
-rwxr-xr-xt/t9122-git-svn-author.sh2
-rwxr-xr-xt/t9123-git-svn-rebuild-with-rewriteroot.sh2
-rwxr-xr-xt/t9124-git-svn-dcommit-auto-props.sh4
-rwxr-xr-xt/t9600-cvsimport.sh2
9 files changed, 13 insertions, 13 deletions
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index de9b6ed5ba..52a451dd57 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing a custom strategy.'
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 5ade88d479..9b238c329b 100755
--- 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 \
- 'initialize git-svn' '
+ 'initialize git svn' '
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 &&
- 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"'
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index 0d48b2619b..7732dea394 100755
--- 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`
- 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
@@ -66,7 +66,7 @@ test_expect_success 'setup some commits to svn' \
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'
diff --git a/t/t9102-git-svn-deep-rmdir.sh b/t/t9102-git-svn-deep-rmdir.sh
index ea5a385cad..e223218015 100755
--- 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 &&
- svn import -m "import for git-svn" . "$svnrepo" &&
+ svn import -m "import for git svn" . "$svnrepo" &&
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}
diff --git a/t/t9112-git-svn-md5less-file.sh b/t/t9112-git-svn-md5less-file.sh
index 91b88cf2e2..a61d6716d2 100755
--- 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 '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
diff --git a/t/t9122-git-svn-author.sh b/t/t9122-git-svn-author.sh
index 1190576a65..1b1cf47281 100755
--- 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 &&
diff --git a/t/t9123-git-svn-rebuild-with-rewriteroot.sh b/t/t9123-git-svn-rebuild-with-rewriteroot.sh
index ddb1a481f7..cf0415274c 100755
--- 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
- svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
+ svn import -m 'import for git svn' . "$svnrepo" >/dev/null
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 0d7e7b2cf1..263dbf5fc2 100755
--- 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
}
-test_expect_success 'initialize git-svn' '
+test_expect_success 'initialize git svn' '
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"
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 0d7786a8c7..d2379e7f62 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-cvsimport basic tests'
+test_description='git cvsimport basic tests'
. ./test-lib.sh
CVSROOT=$(pwd)/cvsroot