summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2007-02-14 01:38:58 (GMT)
committerEric Wong <normalperson@yhbt.net>2007-02-23 08:57:12 (GMT)
commitccb6b6f5b50bb32f90222a3e801a1901bf0b5657 (patch)
treea267be19cbe0f8598119b9f68a5c8b9fa1f9fe4a /t/t9104-git-svn-follow-parent.sh
parent3bc718ba66f8b101b4017e778138660d66829312 (diff)
downloadgit-ccb6b6f5b50bb32f90222a3e801a1901bf0b5657.zip
git-ccb6b6f5b50bb32f90222a3e801a1901bf0b5657.tar.gz
git-ccb6b6f5b50bb32f90222a3e801a1901bf0b5657.tar.bz2
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/t9104-git-svn-follow-parent.sh')
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh9
1 files changed, 5 insertions, 4 deletions
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 a moved directory' "
"
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 'init and fetch from one svn-remote' "
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 @@ test_expect_success 'follow-parent avoids deleting relevant info' "
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 \