git-svn: add test data for SVK merge, with script.
[alt-git.git] / t / t5505-remote.sh
blob852ccb5d7d649a71eeab25eadce6940b9c2a6f63
1 #!/bin/sh
3 test_description='git remote porcelain-ish'
5 . ./test-lib.sh
7 setup_repository () {
8 mkdir "$1" && (
9 cd "$1" &&
10 git init &&
11 >file &&
12 git add file &&
13 test_tick &&
14 git commit -m "Initial" &&
15 git checkout -b side &&
16 >elif &&
17 git add elif &&
18 test_tick &&
19 git commit -m "Second" &&
20 git checkout master
24 tokens_match () {
25 echo "$1" | tr ' ' '\012' | sort | sed -e '/^$/d' >expect &&
26 echo "$2" | tr ' ' '\012' | sort | sed -e '/^$/d' >actual &&
27 test_cmp expect actual
30 check_remote_track () {
31 actual=$(git remote show "$1" | sed -ne 's|^ \(.*\) tracked$|\1|p')
32 shift &&
33 tokens_match "$*" "$actual"
36 check_tracking_branch () {
37 f="" &&
38 r=$(git for-each-ref "--format=%(refname)" |
39 sed -ne "s|^refs/remotes/$1/||p") &&
40 shift &&
41 tokens_match "$*" "$r"
44 test_expect_success setup '
46 setup_repository one &&
47 setup_repository two &&
49 cd two && git branch another
50 ) &&
51 git clone one test
55 test_expect_success 'remote information for the origin' '
57 cd test &&
58 tokens_match origin "$(git remote)" &&
59 check_remote_track origin master side &&
60 check_tracking_branch origin HEAD master side
64 test_expect_success 'add another remote' '
66 cd test &&
67 git remote add -f second ../two &&
68 tokens_match "origin second" "$(git remote)" &&
69 check_remote_track origin master side &&
70 check_remote_track second master side another &&
71 check_tracking_branch second master side another &&
72 git for-each-ref "--format=%(refname)" refs/remotes |
73 sed -e "/^refs\/remotes\/origin\//d" \
74 -e "/^refs\/remotes\/second\//d" >actual &&
75 >expect &&
76 test_cmp expect actual
80 test_expect_success 'remote forces tracking branches' '
82 cd test &&
83 case `git config remote.second.fetch` in
84 +*) true ;;
85 *) false ;;
86 esac
90 test_expect_success 'remove remote' '
92 cd test &&
93 git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
94 git remote rm second
98 test_expect_success 'remove remote' '
100 cd test &&
101 tokens_match origin "$(git remote)" &&
102 check_remote_track origin master side &&
103 git for-each-ref "--format=%(refname)" refs/remotes |
104 sed -e "/^refs\/remotes\/origin\//d" >actual &&
105 >expect &&
106 test_cmp expect actual
110 test_expect_success 'remove remote protects non-remote branches' '
112 cd test &&
113 (cat >expect1 <<EOF
114 Note: A non-remote branch was not removed; to delete it, use:
115 git branch -d master
117 cat >expect2 <<EOF
118 Note: Non-remote branches were not removed; to delete them, use:
119 git branch -d foobranch
120 git branch -d master
122 ) &&
123 git tag footag
124 git config --add remote.oops.fetch "+refs/*:refs/*" &&
125 git remote rm oops 2>actual1 &&
126 git branch foobranch &&
127 git config --add remote.oops.fetch "+refs/*:refs/*" &&
128 git remote rm oops 2>actual2 &&
129 git branch -d foobranch &&
130 git tag -d footag &&
131 test_cmp expect1 actual1 &&
132 test_cmp expect2 actual2
136 cat > test/expect << EOF
137 * remote origin
138 Fetch URL: $(pwd)/one
139 Push URL: $(pwd)/one
140 HEAD branch: master
141 Remote branches:
142 master new (next fetch will store in remotes/origin)
143 side tracked
144 Local branches configured for 'git pull':
145 ahead merges with remote master
146 master merges with remote master
147 octopus merges with remote topic-a
148 and with remote topic-b
149 and with remote topic-c
150 rebase rebases onto remote master
151 Local refs configured for 'git push':
152 master pushes to master (local out of date)
153 master pushes to upstream (create)
154 * remote two
155 Fetch URL: ../two
156 Push URL: ../three
157 HEAD branch (remote HEAD is ambiguous, may be one of the following):
158 another
159 master
160 Local refs configured for 'git push':
161 ahead forces to master (fast forwardable)
162 master pushes to another (up to date)
165 test_expect_success 'show' '
166 (cd test &&
167 git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
168 git fetch &&
169 git checkout -b ahead origin/master &&
170 echo 1 >> file &&
171 test_tick &&
172 git commit -m update file &&
173 git checkout master &&
174 git branch --track octopus origin/master &&
175 git branch --track rebase origin/master &&
176 git branch -d -r origin/master &&
177 git config --add remote.two.url ../two &&
178 git config --add remote.two.pushurl ../three &&
179 git config branch.rebase.rebase true &&
180 git config branch.octopus.merge "topic-a topic-b topic-c" &&
181 (cd ../one &&
182 echo 1 > file &&
183 test_tick &&
184 git commit -m update file) &&
185 git config --add remote.origin.push : &&
186 git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
187 git config --add remote.origin.push +refs/tags/lastbackup &&
188 git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
189 git config --add remote.two.push refs/heads/master:refs/heads/another &&
190 git remote show origin two > output &&
191 git branch -d rebase octopus &&
192 test_cmp expect output)
195 cat > test/expect << EOF
196 * remote origin
197 Fetch URL: $(pwd)/one
198 Push URL: $(pwd)/one
199 HEAD branch: (not queried)
200 Remote branches: (status not queried)
201 master
202 side
203 Local branches configured for 'git pull':
204 ahead merges with remote master
205 master merges with remote master
206 Local refs configured for 'git push' (status not queried):
207 (matching) pushes to (matching)
208 refs/heads/master pushes to refs/heads/upstream
209 refs/tags/lastbackup forces to refs/tags/lastbackup
212 test_expect_success 'show -n' '
213 (mv one one.unreachable &&
214 cd test &&
215 git remote show -n origin > output &&
216 mv ../one.unreachable ../one &&
217 test_cmp expect output)
220 test_expect_success 'prune' '
221 (cd one &&
222 git branch -m side side2) &&
223 (cd test &&
224 git fetch origin &&
225 git remote prune origin &&
226 git rev-parse refs/remotes/origin/side2 &&
227 test_must_fail git rev-parse refs/remotes/origin/side)
230 test_expect_success 'set-head --delete' '
231 (cd test &&
232 git symbolic-ref refs/remotes/origin/HEAD &&
233 git remote set-head --delete origin &&
234 test_must_fail git symbolic-ref refs/remotes/origin/HEAD)
237 test_expect_success 'set-head --auto' '
238 (cd test &&
239 git remote set-head --auto origin &&
240 echo refs/remotes/origin/master >expect &&
241 git symbolic-ref refs/remotes/origin/HEAD >output &&
242 test_cmp expect output
246 cat >test/expect <<EOF
247 error: Multiple remote HEAD branches. Please choose one explicitly with:
248 git remote set-head two another
249 git remote set-head two master
252 test_expect_success 'set-head --auto fails w/multiple HEADs' '
253 (cd test &&
254 test_must_fail git remote set-head --auto two >output 2>&1 &&
255 test_cmp expect output)
258 cat >test/expect <<EOF
259 refs/remotes/origin/side2
262 test_expect_success 'set-head explicit' '
263 (cd test &&
264 git remote set-head origin side2 &&
265 git symbolic-ref refs/remotes/origin/HEAD >output &&
266 git remote set-head origin master &&
267 test_cmp expect output)
270 cat > test/expect << EOF
271 Pruning origin
272 URL: $(pwd)/one
273 * [would prune] origin/side2
276 test_expect_success 'prune --dry-run' '
277 (cd one &&
278 git branch -m side2 side) &&
279 (cd test &&
280 git remote prune --dry-run origin > output &&
281 git rev-parse refs/remotes/origin/side2 &&
282 test_must_fail git rev-parse refs/remotes/origin/side &&
283 (cd ../one &&
284 git branch -m side side2) &&
285 test_cmp expect output)
288 test_expect_success 'add --mirror && prune' '
289 (mkdir mirror &&
290 cd mirror &&
291 git init --bare &&
292 git remote add --mirror -f origin ../one) &&
293 (cd one &&
294 git branch -m side2 side) &&
295 (cd mirror &&
296 git rev-parse --verify refs/heads/side2 &&
297 test_must_fail git rev-parse --verify refs/heads/side &&
298 git fetch origin &&
299 git remote prune origin &&
300 test_must_fail git rev-parse --verify refs/heads/side2 &&
301 git rev-parse --verify refs/heads/side)
304 test_expect_success 'add alt && prune' '
305 (mkdir alttst &&
306 cd alttst &&
307 git init &&
308 git remote add -f origin ../one &&
309 git config remote.alt.url ../one &&
310 git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
311 (cd one &&
312 git branch -m side side2) &&
313 (cd alttst &&
314 git rev-parse --verify refs/remotes/origin/side &&
315 test_must_fail git rev-parse --verify refs/remotes/origin/side2 &&
316 git fetch alt &&
317 git remote prune alt &&
318 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
319 git rev-parse --verify refs/remotes/origin/side2)
322 cat > one/expect << EOF
323 apis/master
324 apis/side
325 drosophila/another
326 drosophila/master
327 drosophila/side
330 test_expect_success 'update' '
332 (cd one &&
333 git remote add drosophila ../two &&
334 git remote add apis ../mirror &&
335 git remote update &&
336 git branch -r > output &&
337 test_cmp expect output)
341 cat > one/expect << EOF
342 drosophila/another
343 drosophila/master
344 drosophila/side
345 manduca/master
346 manduca/side
347 megaloprepus/master
348 megaloprepus/side
351 test_expect_success 'update with arguments' '
353 (cd one &&
354 for b in $(git branch -r)
356 git branch -r -d $b || break
357 done &&
358 git remote add manduca ../mirror &&
359 git remote add megaloprepus ../mirror &&
360 git config remotes.phobaeticus "drosophila megaloprepus" &&
361 git config remotes.titanus manduca &&
362 git remote update phobaeticus titanus &&
363 git branch -r > output &&
364 test_cmp expect output)
368 cat > one/expect << EOF
369 apis/master
370 apis/side
371 manduca/master
372 manduca/side
373 megaloprepus/master
374 megaloprepus/side
377 test_expect_success 'update default' '
379 (cd one &&
380 for b in $(git branch -r)
382 git branch -r -d $b || break
383 done &&
384 git config remote.drosophila.skipDefaultUpdate true &&
385 git remote update default &&
386 git branch -r > output &&
387 test_cmp expect output)
391 cat > one/expect << EOF
392 drosophila/another
393 drosophila/master
394 drosophila/side
397 test_expect_success 'update default (overridden, with funny whitespace)' '
399 (cd one &&
400 for b in $(git branch -r)
402 git branch -r -d $b || break
403 done &&
404 git config remotes.default "$(printf "\t drosophila \n")" &&
405 git remote update default &&
406 git branch -r > output &&
407 test_cmp expect output)
411 test_expect_success '"remote show" does not show symbolic refs' '
413 git clone one three &&
414 (cd three &&
415 git remote show origin > output &&
416 ! grep "^ *HEAD$" < output &&
417 ! grep -i stale < output)
421 test_expect_success 'reject adding remote with an invalid name' '
423 test_must_fail git remote add some:url desired-name
427 # The first three test if the tracking branches are properly renamed,
428 # the last two ones check if the config is updated.
430 test_expect_success 'rename a remote' '
432 git clone one four &&
433 (cd four &&
434 git remote rename origin upstream &&
435 rmdir .git/refs/remotes/origin &&
436 test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
437 test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
438 test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
439 test "$(git config branch.master.remote)" = "upstream")
443 cat > remotes_origin << EOF
444 URL: $(pwd)/one
445 Push: refs/heads/master:refs/heads/upstream
446 Pull: refs/heads/master:refs/heads/origin
449 test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
450 git clone one five &&
451 origin_url=$(pwd)/one &&
452 (cd five &&
453 git remote rm origin &&
454 mkdir -p .git/remotes &&
455 cat ../remotes_origin > .git/remotes/origin &&
456 git remote rename origin origin &&
457 ! test -f .git/remotes/origin &&
458 test "$(git config remote.origin.url)" = "$origin_url" &&
459 test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
460 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
463 test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
464 git clone one six &&
465 origin_url=$(pwd)/one &&
466 (cd six &&
467 git remote rm origin &&
468 echo "$origin_url" > .git/branches/origin &&
469 git remote rename origin origin &&
470 ! test -f .git/branches/origin &&
471 test "$(git config remote.origin.url)" = "$origin_url" &&
472 test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin")
475 test_expect_success 'remote prune to cause a dangling symref' '
476 git clone one seven &&
478 cd one &&
479 git checkout side2 &&
480 git branch -D master
481 ) &&
483 cd seven &&
484 git remote prune origin
485 ) 2>err &&
486 grep "has become dangling" err &&
488 : And the dangling symref will not cause other annoying errors
490 cd seven &&
491 git branch -a
492 ) 2>err &&
493 ! grep "points nowhere" err
495 cd seven &&
496 test_must_fail git branch nomore origin
497 ) 2>err &&
498 grep "dangling symref" err
501 test_expect_success 'show empty remote' '
503 test_create_repo empty &&
504 git clone empty empty-clone &&
506 cd empty-clone &&
507 git remote show origin
511 test_done