remote-helpers: test: simplify remote URLs

No need to specify $PWD any more. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Felipe Contreras committed May 24, 2013 at 21:29 UTC 5f5e92fb7954c0bd258563541fed394bc5f88544
4 files changed +19 -19
contrib/remote-helpers/test-bzr.sh
+6 -6
@@ -41,7 +41,7 @@ test_expect_success 'cloning' '
41 bzr commit -m one
42 ) &&
43
44 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
44 + git clone "bzr::bzrrepo" gitrepo &&
45 check gitrepo one master
46 '
47
@@ -216,7 +216,7 @@ test_expect_success 'fetch utf-8 filenames' '
216 ) &&
217
218 (
219 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
219 + git clone "bzr::bzrrepo" gitrepo &&
220 cd gitrepo &&
221 git -c core.quotepath=false ls-files > ../actual
222 ) &&
@@ -242,7 +242,7 @@ test_expect_success 'push utf-8 filenames' '
242 ) &&
243
244 (
245 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
245 + git clone "bzr::bzrrepo" gitrepo &&
246 cd gitrepo &&
247
248 echo test >> "ærø" &&
@@ -268,7 +268,7 @@ test_expect_success 'pushing a merge' '
268 bzr commit -m one
269 ) &&
270
271 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
271 + git clone "bzr::bzrrepo" gitrepo &&
272
273 (
274 cd bzrrepo &&
@@ -319,7 +319,7 @@ test_expect_success 'proper bzr repo' '
319 ) &&
320
321 (
322 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
322 + git clone "bzr::bzrrepo" gitrepo &&
323 cd gitrepo &&
324 git for-each-ref --format "%(refname:short)" refs/remotes/origin > ../actual
325 ) &&
@@ -342,7 +342,7 @@ test_expect_success 'strip' '
342 bzr commit -m two
343 ) &&
344
345 - git clone "bzr::$PWD/bzrrepo" gitrepo &&
345 + git clone "bzr::bzrrepo" gitrepo &&
346
347 (
348 cd bzrrepo &&
contrib/remote-helpers/test-hg-bidi.sh
+3 -3
@@ -22,7 +22,7 @@ fi
22
23 # clone to a git repo
24 git_clone () {
25 - git clone -q "hg::$PWD/$1" $2
25 + git clone -q "hg::$1" $2
26 }
27
28 # clone to an hg repo
@@ -31,7 +31,7 @@ hg_clone () {
31 hg init $2 &&
32 hg -R $2 bookmark -i master &&
33 cd $1 &&
34 - git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
34 + git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
35 ) &&
36
37 (cd $2 && hg -q update)
@@ -43,7 +43,7 @@ hg_push () {
43 cd $2
44 old=$(git symbolic-ref --short HEAD)
45 git checkout -q -b tmp &&
46 - git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
46 + git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
47 git checkout -q $old &&
48 git branch -q -D tmp 2> /dev/null || true
49 )
contrib/remote-helpers/test-hg-hg-git.sh
+3 -3
@@ -27,7 +27,7 @@ fi
27
28 # clone to a git repo with git
29 git_clone_git () {
30 - git clone -q "hg::$PWD/$1" $2
30 + git clone -q "hg::$1" $2
31 }
32
33 # clone to an hg repo with git
@@ -36,7 +36,7 @@ hg_clone_git () {
36 hg init $2 &&
37 hg -R $2 bookmark -i master &&
38 cd $1 &&
39 - git push -q "hg::$PWD/../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
39 + git push -q "hg::../$2" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*'
40 ) &&
41
42 (cd $2 && hg -q update)
@@ -63,7 +63,7 @@ hg_push_git () {
63 cd $2
64 old=$(git symbolic-ref --short HEAD)
65 git checkout -q -b tmp &&
66 - git fetch -q "hg::$PWD/../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
66 + git fetch -q "hg::../$1" 'refs/tags/*:refs/tags/*' 'refs/heads/*:refs/heads/*' &&
67 git checkout -q $old &&
68 git branch -q -D tmp 2> /dev/null || true
69 )
contrib/remote-helpers/test-hg.sh
+7 -7
@@ -53,7 +53,7 @@ test_expect_success 'cloning' '
53 hg commit -m zero
54 ) &&
55
56 - git clone "hg::$PWD/hgrepo" gitrepo &&
56 + git clone "hg::hgrepo" gitrepo &&
57 check gitrepo zero master
58 '
59
@@ -67,12 +67,12 @@ test_expect_success 'cloning with branches' '
67 hg commit -m next
68 ) &&
69
70 - git clone "hg::$PWD/hgrepo" gitrepo &&
70 + git clone "hg::hgrepo" gitrepo &&
71 check gitrepo next next &&
72
73 (cd hgrepo && hg checkout default) &&
74
75 - git clone "hg::$PWD/hgrepo" gitrepo2 &&
75 + git clone "hg::hgrepo" gitrepo2 &&
76 check gitrepo2 zero master
77 '
78
@@ -86,7 +86,7 @@ test_expect_success 'cloning with bookmarks' '
86 hg commit -m feature-a
87 ) &&
88
89 - git clone "hg::$PWD/hgrepo" gitrepo &&
89 + git clone "hg::hgrepo" gitrepo &&
90 check gitrepo feature-a feature-a
91 '
92
@@ -98,7 +98,7 @@ test_expect_success 'cloning with detached head' '
98 hg update -r 0
99 ) &&
100
101 - git clone "hg::$PWD/hgrepo" gitrepo &&
101 + git clone "hg::hgrepo" gitrepo &&
102 check gitrepo zero master
103 '
104
@@ -111,7 +111,7 @@ test_expect_success 'update bookmark' '
111 ) &&
112
113 (
114 - git clone "hg::$PWD/hgrepo" gitrepo &&
114 + git clone "hg::hgrepo" gitrepo &&
115 cd gitrepo &&
116 git checkout --quiet devel &&
117 echo devel > content &&
@@ -155,7 +155,7 @@ test_expect_success 'authors' '
155 author_test kappa "test@example.com" "Unknown <test@example.com>"
156 ) &&
157
158 - git clone "hg::$PWD/hgrepo" gitrepo &&
158 + git clone "hg::hgrepo" gitrepo &&
159 git --git-dir=gitrepo/.git log --reverse --format="%an <%ae>" > actual &&
160
161 test_cmp expected actual