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>
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 8b6c8ff..7dcfc7e 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -214,7 +214,7 @@
test_expect_success "$name" "diff -u a expected"
test_expect_failure 'exit if remote refs are ambigious' "
- git-repo-config --add svn-remote.svn.fetch \
+ git-config --add svn-remote.svn.fetch \
bar:refs/remotes/git-svn &&
git-svn migrate
"
@@ -222,7 +222,7 @@
test_expect_failure 'exit if init-ing a would clobber a URL' "
svnadmin create ${PWD}/svnrepo2 &&
svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
- git-repo-config --unset svn-remote.svn.fetch \
+ git-config --unset svn-remote.svn.fetch \
'^bar:refs/remotes/git-svn$' &&
git-svn init ${svnrepo}2/bar
"
@@ -230,9 +230,9 @@
test_expect_success \
'init allows us to connect to another directory in the same repo' "
git-svn init -i bar $svnrepo/bar &&
- git repo-config --get svn-remote.svn.fetch \
+ git config --get svn-remote.svn.fetch \
'^bar:refs/remotes/bar$' &&
- git repo-config --get svn-remote.svn.fetch \
+ git config --get svn-remote.svn.fetch \
'^:refs/remotes/git-svn$'
"
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 53f5a92..bd4f366 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -39,10 +39,10 @@
"
test_expect_success 'init and fetch from one svn-remote' "
- git-repo-config svn-remote.svn.url $svnrepo &&
- git-repo-config --add svn-remote.svn.fetch \
+ git-config svn-remote.svn.url $svnrepo &&
+ git-config --add svn-remote.svn.fetch \
trunk:refs/remotes/svn/trunk &&
- git-repo-config --add svn-remote.svn.fetch \
+ git-config --add svn-remote.svn.fetch \
thunk:refs/remotes/svn/thunk &&
git-svn fetch -i svn/thunk &&
test \"\`git-rev-parse --verify refs/remotes/svn/trunk\`\" \
@@ -54,7 +54,7 @@
test_expect_success 'follow deleted parent' "
svn cp -m 'resurrecting trunk as junk' \
-r2 $svnrepo/trunk $svnrepo/junk &&
- git-repo-config --add svn-remote.svn.fetch \
+ git-config --add svn-remote.svn.fetch \
junk:refs/remotes/svn/junk &&
git-svn fetch -i svn/thunk &&
git-svn fetch -i svn/junk &&
@@ -124,6 +124,7 @@
svn mv t native/t &&
for i in a b c; do svn mv \$i.pm native/\$i.pm; done &&
echo z >> native/t/c.t &&
+ poke native/t/c.t &&
svn commit -m 'reorg test' &&
cd .. &&
git-svn init -i r9270-t \
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9f107ad..d26c355 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -34,14 +34,14 @@
! 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 '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 @@
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 &&
diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index 47cccdfd..be21fc1 100755
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -23,14 +23,19 @@
svn commit -m 'start a new branch' &&
svn up &&
echo 'hi' >> branches/start/src/b/readme &&
+ poke branches/start/src/b/readme &&
echo 'hey' >> branches/start/src/a/readme &&
+ poke branches/start/src/a/readme &&
svn commit -m 'hi' &&
svn up &&
svn cp branches/start tags/end &&
echo 'bye' >> tags/end/src/b/readme &&
+ poke tags/end/src/b/readme &&
echo 'aye' >> tags/end/src/a/readme &&
+ poke tags/end/src/a/readme &&
svn commit -m 'the end' &&
echo 'byebye' >> tags/end/src/b/readme &&
+ poke tags/end/src/b/readme &&
svn commit -m 'nothing to see here'
cd .. &&
git config --add svn-remote.svn.url $svnrepo &&
diff --git a/t/t9109-git-svn-svk-mirrorpaths.sh b/t/t9109-git-svn-svk-mirrorpaths.sh
index 0e0ba3d..7e42151 100755
--- a/t/t9109-git-svn-svk-mirrorpaths.sh
+++ b/t/t9109-git-svn-svk-mirrorpaths.sh
@@ -55,11 +55,13 @@
svn up &&
echo random untested feature >> mirror/foobar/trunk/readme &&
+ poke mirror/foobar/trunk/readme &&
svn commit -m 'add a c00l feature to trunk' &&
svn ps -r 5 --revprop svm:headrev $uuid:3 $svnrepo &&
svn up &&
echo bug fix >> mirror/foobar/branches/silly/readme &&
+ poke mirror/foobar/branches/silly/readme &&
svn commit -m 'fix a bug' &&
svn ps -r 6 --revprop svm:headrev $uuid:4 $svnrepo &&
