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>
This commit is contained in:
parent
1f77354b02
commit
f964732c05
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
test_description='git-merge
|
test_description='git merge
|
||||||
|
|
||||||
Testing a custom strategy.'
|
Testing a custom strategy.'
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ esac
|
|||||||
say 'define NO_SVN_TESTS to skip git svn tests'
|
say 'define NO_SVN_TESTS to skip git svn tests'
|
||||||
|
|
||||||
test_expect_success \
|
test_expect_success \
|
||||||
'initialize git-svn' '
|
'initialize git svn' '
|
||||||
mkdir import &&
|
mkdir import &&
|
||||||
cd import &&
|
cd import &&
|
||||||
echo foo > foo &&
|
echo foo > foo &&
|
||||||
@ -31,7 +31,7 @@ test_expect_success \
|
|||||||
echo "zzz" > bar/zzz &&
|
echo "zzz" > bar/zzz &&
|
||||||
echo "#!/bin/sh" > exec.sh &&
|
echo "#!/bin/sh" > exec.sh &&
|
||||||
chmod +x 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 .. &&
|
cd .. &&
|
||||||
rm -rf import &&
|
rm -rf import &&
|
||||||
git svn init "$svnrepo"'
|
git svn init "$svnrepo"'
|
||||||
|
@ -48,7 +48,7 @@ EOF
|
|||||||
printf "\r\n" > empty_crlf
|
printf "\r\n" > empty_crlf
|
||||||
a_empty_crlf=`git-hash-object -w 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 ..
|
cd ..
|
||||||
|
|
||||||
rm -rf import
|
rm -rf import
|
||||||
@ -66,7 +66,7 @@ test_expect_success 'setup some commits to svn' \
|
|||||||
svn commit -m "Propset Id" &&
|
svn commit -m "Propset Id" &&
|
||||||
cd ..'
|
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'
|
test_expect_success 'fetch revisions from svn' 'git svn fetch'
|
||||||
|
|
||||||
name='test svn:keywords ignoring'
|
name='test svn:keywords ignoring'
|
||||||
|
@ -9,11 +9,11 @@ test_expect_success 'initialize repo' '
|
|||||||
mkdir -p deeply/nested/directory/number/2 &&
|
mkdir -p deeply/nested/directory/number/2 &&
|
||||||
echo foo > deeply/nested/directory/number/1/file &&
|
echo foo > deeply/nested/directory/number/1/file &&
|
||||||
echo foo > deeply/nested/directory/number/2/another &&
|
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 init "$svnrepo" &&
|
||||||
git svn fetch &&
|
git svn fetch &&
|
||||||
git checkout -f -b test-rmdir ${remotes_git_svn}
|
git checkout -f -b test-rmdir ${remotes_git_svn}
|
||||||
|
@ -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_expect_success 'fetch revisions from svn' 'git svn fetch'
|
||||||
test_done
|
test_done
|
||||||
|
@ -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 &&
|
mkdir work.git &&
|
||||||
(
|
(
|
||||||
cd work.git &&
|
cd work.git &&
|
||||||
|
@ -10,7 +10,7 @@ test_description='git svn respects rewriteRoot during rebuild'
|
|||||||
mkdir import
|
mkdir import
|
||||||
cd import
|
cd import
|
||||||
touch foo
|
touch foo
|
||||||
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
|
svn import -m 'import for git svn' . "$svnrepo" >/dev/null
|
||||||
cd ..
|
cd ..
|
||||||
rm -rf import
|
rm -rf import
|
||||||
|
|
||||||
|
@ -16,12 +16,12 @@ enable-auto-props=$1
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
test_expect_success 'initialize git-svn' '
|
test_expect_success 'initialize git svn' '
|
||||||
mkdir import &&
|
mkdir import &&
|
||||||
(
|
(
|
||||||
cd import &&
|
cd import &&
|
||||||
echo foo >foo &&
|
echo foo >foo &&
|
||||||
svn import -m "import for git-svn" . "$svnrepo"
|
svn import -m "import for git svn" . "$svnrepo"
|
||||||
) &&
|
) &&
|
||||||
rm -rf import &&
|
rm -rf import &&
|
||||||
git svn init "$svnrepo"
|
git svn init "$svnrepo"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
test_description='git-cvsimport basic tests'
|
test_description='git cvsimport basic tests'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
CVSROOT=$(pwd)/cvsroot
|
CVSROOT=$(pwd)/cvsroot
|
||||||
|
Loading…
Reference in New Issue
Block a user