summaryrefslogtreecommitdiff
path: root/t/t9107-git-svn-migrate.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-02-13 17:38:58 -0800
committerEric Wong <normalperson@yhbt.net>2007-02-23 00:57:12 -0800
commitccb6b6f5b50bb32f90222a3e801a1901bf0b5657 (patch)
treea267be19cbe0f8598119b9f68a5c8b9fa1f9fe4a /t/t9107-git-svn-migrate.sh
parent3bc718ba66f8b101b4017e778138660d66829312 (diff)
downloadgit-ccb6b6f5b50bb32f90222a3e801a1901bf0b5657.tar.gz
t910*: s/repo-config/config/g; poke around possible race conditions
Some of the repo-config => config renaming missed the git-svn tests; so I'm just renaming them to be consisten with the rest of the modern git. Also, some of the newer tests didn't have 'poke' in them to workaround race conditions on fast machines. This adds places where they can _possibly_ occur; but I don't have fast enough hardware to trigger them. Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9107-git-svn-migrate.sh')
-rwxr-xr-xt/t9107-git-svn-migrate.sh14
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9f107ad7bf..d26c355f05 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -34,14 +34,14 @@ test_expect_success 'initialize old-style (v0) git-svn layout' "
! test -d $GIT_DIR/git-svn &&
git-rev-parse --verify refs/remotes/git-svn^0 &&
git-rev-parse --verify refs/remotes/svn^0 &&
- test \`git repo-config --get svn-remote.svn.url\` = '$svnrepo' &&
- test \`git repo-config --get svn-remote.svn.fetch\` = \
+ test \`git config --get svn-remote.svn.url\` = '$svnrepo' &&
+ test \`git config --get svn-remote.svn.fetch\` = \
':refs/remotes/git-svn'
"
test_expect_success 'initialize a multi-repository repo' "
git-svn multi-init $svnrepo -T trunk -t tags -b branches &&
- git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&
+ git-config --get-all svn-remote.svn.fetch > fetch.out &&
grep '^trunk:refs/remotes/trunk$' fetch.out &&
test -n \"\`git-config --get svn-remote.svn.branches \
'^branches/\*:refs/remotes/\*$'\`\" &&
@@ -73,8 +73,8 @@ test_expect_success 'multi-fetch works on partial urls + paths' "
"
test_expect_success 'migrate --minimize on old multi-inited layout' "
- git repo-config --unset-all svn-remote.svn.fetch &&
- git repo-config --unset-all svn-remote.svn.url &&
+ git config --unset-all svn-remote.svn.fetch &&
+ git config --unset-all svn-remote.svn.url &&
rm -rf $GIT_DIR/svn &&
for i in \`cat fetch.out\`; do
path=\`expr \$i : '\\([^:]*\\):.*$'\`
@@ -85,8 +85,8 @@ test_expect_success 'migrate --minimize on old multi-inited layout' "
echo $svnrepo\$path > $GIT_DIR/svn/\$ref/info/url ) || exit 1;
done &&
git-svn migrate --minimize &&
- test -z \"\`git-repo-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
- git-repo-config --get-all svn-remote.svn.fetch > fetch.out &&
+ test -z \"\`git-config -l |grep -v '^svn-remote\.git-svn\.'\`\" &&
+ git-config --get-all svn-remote.svn.fetch > fetch.out &&
grep '^trunk:refs/remotes/trunk$' fetch.out &&
grep '^branches/a:refs/remotes/a$' fetch.out &&
grep '^branches/b:refs/remotes/b$' fetch.out &&