Merge branch 'sg/test-i18ngrep'
[git/git.git] / t / t5510-fetch.sh
1 #!/bin/sh
2 # Copyright (c) 2006, Junio C Hamano.
3
4 test_description='Per branch config variables affects "git fetch".
5
6 '
7
8 . ./test-lib.sh
9
10 D=$(pwd)
11
12 test_bundle_object_count () {
13 git verify-pack -v "$1" >verify.out &&
14 test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
15 }
16
17 convert_bundle_to_pack () {
18 while read x && test -n "$x"
19 do
20 :;
21 done
22 cat
23 }
24
25 test_expect_success setup '
26 echo >file original &&
27 git add file &&
28 git commit -a -m original'
29
30 test_expect_success "clone and setup child repos" '
31 git clone . one &&
32 (
33 cd one &&
34 echo >file updated by one &&
35 git commit -a -m "updated by one"
36 ) &&
37 git clone . two &&
38 (
39 cd two &&
40 git config branch.master.remote one &&
41 git config remote.one.url ../one/.git/ &&
42 git config remote.one.fetch refs/heads/master:refs/heads/one
43 ) &&
44 git clone . three &&
45 (
46 cd three &&
47 git config branch.master.remote two &&
48 git config branch.master.merge refs/heads/one &&
49 mkdir -p .git/remotes &&
50 {
51 echo "URL: ../two/.git/"
52 echo "Pull: refs/heads/master:refs/heads/two"
53 echo "Pull: refs/heads/one:refs/heads/one"
54 } >.git/remotes/two
55 ) &&
56 git clone . bundle &&
57 git clone . seven
58 '
59
60 test_expect_success "fetch test" '
61 cd "$D" &&
62 echo >file updated by origin &&
63 git commit -a -m "updated by origin" &&
64 cd two &&
65 git fetch &&
66 test -f .git/refs/heads/one &&
67 mine=$(git rev-parse refs/heads/one) &&
68 his=$(cd ../one && git rev-parse refs/heads/master) &&
69 test "z$mine" = "z$his"
70 '
71
72 test_expect_success "fetch test for-merge" '
73 cd "$D" &&
74 cd three &&
75 git fetch &&
76 test -f .git/refs/heads/two &&
77 test -f .git/refs/heads/one &&
78 master_in_two=$(cd ../two && git rev-parse master) &&
79 one_in_two=$(cd ../two && git rev-parse one) &&
80 {
81 echo "$one_in_two "
82 echo "$master_in_two not-for-merge"
83 } >expected &&
84 cut -f -2 .git/FETCH_HEAD >actual &&
85 test_cmp expected actual'
86
87 test_expect_success 'fetch --prune on its own works as expected' '
88 cd "$D" &&
89 git clone . prune &&
90 cd prune &&
91 git update-ref refs/remotes/origin/extrabranch master &&
92
93 git fetch --prune origin &&
94 test_must_fail git rev-parse origin/extrabranch
95 '
96
97 test_expect_success 'fetch --prune with a branch name keeps branches' '
98 cd "$D" &&
99 git clone . prune-branch &&
100 cd prune-branch &&
101 git update-ref refs/remotes/origin/extrabranch master &&
102
103 git fetch --prune origin master &&
104 git rev-parse origin/extrabranch
105 '
106
107 test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
108 cd "$D" &&
109 git clone . prune-namespace &&
110 cd prune-namespace &&
111
112 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
113 git rev-parse origin/master
114 '
115
116 test_expect_success 'fetch --prune handles overlapping refspecs' '
117 cd "$D" &&
118 git update-ref refs/pull/42/head master &&
119 git clone . prune-overlapping &&
120 cd prune-overlapping &&
121 git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
122
123 git fetch --prune origin &&
124 git rev-parse origin/master &&
125 git rev-parse origin/pr/42 &&
126
127 git config --unset-all remote.origin.fetch &&
128 git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
129 git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
130
131 git fetch --prune origin &&
132 git rev-parse origin/master &&
133 git rev-parse origin/pr/42
134 '
135
136 test_expect_success 'fetch --prune --tags prunes branches but not tags' '
137 cd "$D" &&
138 git clone . prune-tags &&
139 cd prune-tags &&
140 git tag sometag master &&
141 # Create what looks like a remote-tracking branch from an earlier
142 # fetch that has since been deleted from the remote:
143 git update-ref refs/remotes/origin/fake-remote master &&
144
145 git fetch --prune --tags origin &&
146 git rev-parse origin/master &&
147 test_must_fail git rev-parse origin/fake-remote &&
148 git rev-parse sometag
149 '
150
151 test_expect_success 'fetch --prune --tags with branch does not prune other things' '
152 cd "$D" &&
153 git clone . prune-tags-branch &&
154 cd prune-tags-branch &&
155 git tag sometag master &&
156 git update-ref refs/remotes/origin/extrabranch master &&
157
158 git fetch --prune --tags origin master &&
159 git rev-parse origin/extrabranch &&
160 git rev-parse sometag
161 '
162
163 test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
164 cd "$D" &&
165 git clone . prune-tags-refspec &&
166 cd prune-tags-refspec &&
167 git tag sometag master &&
168 git update-ref refs/remotes/origin/foo/otherbranch master &&
169 git update-ref refs/remotes/origin/extrabranch master &&
170
171 git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
172 test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
173 git rev-parse origin/extrabranch &&
174 git rev-parse sometag
175 '
176
177 test_expect_success 'fetch tags when there is no tags' '
178
179 cd "$D" &&
180
181 mkdir notags &&
182 cd notags &&
183 git init &&
184
185 git fetch -t ..
186
187 '
188
189 test_expect_success 'fetch following tags' '
190
191 cd "$D" &&
192 git tag -a -m 'annotated' anno HEAD &&
193 git tag light HEAD &&
194
195 mkdir four &&
196 cd four &&
197 git init &&
198
199 git fetch .. :track &&
200 git show-ref --verify refs/tags/anno &&
201 git show-ref --verify refs/tags/light
202
203 '
204
205 test_expect_success 'fetch uses remote ref names to describe new refs' '
206 cd "$D" &&
207 git init descriptive &&
208 (
209 cd descriptive &&
210 git config remote.o.url .. &&
211 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
212 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
213 git fetch o
214 ) &&
215 git tag -a -m "Descriptive tag" descriptive-tag &&
216 git branch descriptive-branch &&
217 git checkout descriptive-branch &&
218 echo "Nuts" >crazy &&
219 git add crazy &&
220 git commit -a -m "descriptive commit" &&
221 git update-ref refs/others/crazy HEAD &&
222 (
223 cd descriptive &&
224 git fetch o 2>actual &&
225 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
226 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
227 test_i18ngrep "new ref.* -> crazy$" actual
228 ) &&
229 git checkout master
230 '
231
232 test_expect_success 'fetch must not resolve short tag name' '
233
234 cd "$D" &&
235
236 mkdir five &&
237 cd five &&
238 git init &&
239
240 test_must_fail git fetch .. anno:five
241
242 '
243
244 test_expect_success 'fetch can now resolve short remote name' '
245
246 cd "$D" &&
247 git update-ref refs/remotes/six/HEAD HEAD &&
248
249 mkdir six &&
250 cd six &&
251 git init &&
252
253 git fetch .. six:six
254 '
255
256 test_expect_success 'create bundle 1' '
257 cd "$D" &&
258 echo >file updated again by origin &&
259 git commit -a -m "tip" &&
260 git bundle create bundle1 master^..master
261 '
262
263 test_expect_success 'header of bundle looks right' '
264 head -n 1 "$D"/bundle1 | grep "^#" &&
265 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
266 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
267 head -n 4 "$D"/bundle1 | grep "^$"
268 '
269
270 test_expect_success 'create bundle 2' '
271 cd "$D" &&
272 git bundle create bundle2 master~2..master
273 '
274
275 test_expect_success 'unbundle 1' '
276 cd "$D/bundle" &&
277 git checkout -b some-branch &&
278 test_must_fail git fetch "$D/bundle1" master:master
279 '
280
281
282 test_expect_success 'bundle 1 has only 3 files ' '
283 cd "$D" &&
284 convert_bundle_to_pack <bundle1 >bundle.pack &&
285 git index-pack bundle.pack &&
286 test_bundle_object_count bundle.pack 3
287 '
288
289 test_expect_success 'unbundle 2' '
290 cd "$D/bundle" &&
291 git fetch ../bundle2 master:master &&
292 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
293 '
294
295 test_expect_success 'bundle does not prerequisite objects' '
296 cd "$D" &&
297 touch file2 &&
298 git add file2 &&
299 git commit -m add.file2 file2 &&
300 git bundle create bundle3 -1 HEAD &&
301 convert_bundle_to_pack <bundle3 >bundle.pack &&
302 git index-pack bundle.pack &&
303 test_bundle_object_count bundle.pack 3
304 '
305
306 test_expect_success 'bundle should be able to create a full history' '
307
308 cd "$D" &&
309 git tag -a -m '1.0' v1.0 master &&
310 git bundle create bundle4 v1.0
311
312 '
313
314 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
315 git config branch.master.remote yeti &&
316 git config branch.master.merge refs/heads/bigfoot &&
317 git config remote.blub.url one &&
318 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
319 git fetch blub
320 '
321
322 # URL supplied to fetch does not match the url of the configured branch's remote
323 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
324 one_head=$(cd one && git rev-parse HEAD) &&
325 this_head=$(git rev-parse HEAD) &&
326 git update-ref -d FETCH_HEAD &&
327 git fetch one &&
328 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
329 test $this_head = "$(git rev-parse --verify HEAD)"
330 '
331
332 # URL supplied to fetch matches the url of the configured branch's remote and
333 # the merge spec matches the branch the remote HEAD points to
334 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
335 one_ref=$(cd one && git symbolic-ref HEAD) &&
336 git config branch.master.remote blub &&
337 git config branch.master.merge "$one_ref" &&
338 git update-ref -d FETCH_HEAD &&
339 git fetch one &&
340 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
341 test $this_head = "$(git rev-parse --verify HEAD)"
342 '
343
344 # URL supplied to fetch matches the url of the configured branch's remote, but
345 # the merge spec does not match the branch the remote HEAD points to
346 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
347 git config branch.master.merge "${one_ref}_not" &&
348 git update-ref -d FETCH_HEAD &&
349 git fetch one &&
350 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
351 test $this_head = "$(git rev-parse --verify HEAD)"
352 '
353
354 # the strange name is: a\!'b
355 test_expect_success 'quoting of a strangely named repo' '
356 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
357 cat result &&
358 grep "fatal: '\''a\\\\!'\''b'\''" result
359 '
360
361 test_expect_success 'bundle should record HEAD correctly' '
362
363 cd "$D" &&
364 git bundle create bundle5 HEAD master &&
365 git bundle list-heads bundle5 >actual &&
366 for h in HEAD refs/heads/master
367 do
368 echo "$(git rev-parse --verify $h) $h"
369 done >expect &&
370 test_cmp expect actual
371
372 '
373
374 test_expect_success 'mark initial state of origin/master' '
375 (
376 cd three &&
377 git tag base-origin-master refs/remotes/origin/master
378 )
379 '
380
381 test_expect_success 'explicit fetch should update tracking' '
382
383 cd "$D" &&
384 git branch -f side &&
385 (
386 cd three &&
387 git update-ref refs/remotes/origin/master base-origin-master &&
388 o=$(git rev-parse --verify refs/remotes/origin/master) &&
389 git fetch origin master &&
390 n=$(git rev-parse --verify refs/remotes/origin/master) &&
391 test "$o" != "$n" &&
392 test_must_fail git rev-parse --verify refs/remotes/origin/side
393 )
394 '
395
396 test_expect_success 'explicit pull should update tracking' '
397
398 cd "$D" &&
399 git branch -f side &&
400 (
401 cd three &&
402 git update-ref refs/remotes/origin/master base-origin-master &&
403 o=$(git rev-parse --verify refs/remotes/origin/master) &&
404 git pull origin master &&
405 n=$(git rev-parse --verify refs/remotes/origin/master) &&
406 test "$o" != "$n" &&
407 test_must_fail git rev-parse --verify refs/remotes/origin/side
408 )
409 '
410
411 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
412 cd "$D" &&
413 (
414 cd three &&
415 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
416 )
417 '
418
419 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
420 cd "$D" &&
421 git branch -f side &&
422 (
423 cd three &&
424 git update-ref refs/remotes/origin/master base-origin-master &&
425 o=$(git rev-parse --verify refs/remotes/origin/master) &&
426 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
427 n=$(git rev-parse --verify refs/remotes/origin/master) &&
428 test "$o" = "$n" &&
429 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
430 git rev-parse --verify refs/remotes/other/master
431 )
432 '
433
434 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
435 cd "$D" &&
436 git branch -f side &&
437 (
438 cd three &&
439 git update-ref refs/remotes/origin/master base-origin-master &&
440 o=$(git rev-parse --verify refs/remotes/origin/master) &&
441 git fetch --refmap="" origin master &&
442 n=$(git rev-parse --verify refs/remotes/origin/master) &&
443 test "$o" = "$n" &&
444 test_must_fail git rev-parse --verify refs/remotes/origin/side
445 )
446 '
447
448 test_expect_success 'configured fetch updates tracking' '
449
450 cd "$D" &&
451 git branch -f side &&
452 (
453 cd three &&
454 git update-ref refs/remotes/origin/master base-origin-master &&
455 o=$(git rev-parse --verify refs/remotes/origin/master) &&
456 git fetch origin &&
457 n=$(git rev-parse --verify refs/remotes/origin/master) &&
458 test "$o" != "$n" &&
459 git rev-parse --verify refs/remotes/origin/side
460 )
461 '
462
463 test_expect_success 'non-matching refspecs do not confuse tracking update' '
464 cd "$D" &&
465 git update-ref refs/odd/location HEAD &&
466 (
467 cd three &&
468 git update-ref refs/remotes/origin/master base-origin-master &&
469 git config --add remote.origin.fetch \
470 refs/odd/location:refs/remotes/origin/odd &&
471 o=$(git rev-parse --verify refs/remotes/origin/master) &&
472 git fetch origin master &&
473 n=$(git rev-parse --verify refs/remotes/origin/master) &&
474 test "$o" != "$n" &&
475 test_must_fail git rev-parse --verify refs/remotes/origin/odd
476 )
477 '
478
479 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
480
481 cd "$D" &&
482 test_must_fail git push seven no:no
483
484 '
485
486 test_expect_success 'auto tag following fetches minimum' '
487
488 cd "$D" &&
489 git clone .git follow &&
490 git checkout HEAD^0 &&
491 (
492 for i in 1 2 3 4 5 6 7
493 do
494 echo $i >>file &&
495 git commit -m $i -a &&
496 git tag -a -m $i excess-$i || exit 1
497 done
498 ) &&
499 git checkout master &&
500 (
501 cd follow &&
502 git fetch
503 )
504 '
505
506 test_expect_success 'refuse to fetch into the current branch' '
507
508 test_must_fail git fetch . side:master
509
510 '
511
512 test_expect_success 'fetch into the current branch with --update-head-ok' '
513
514 git fetch --update-head-ok . side:master
515
516 '
517
518 test_expect_success 'fetch --dry-run' '
519
520 rm -f .git/FETCH_HEAD &&
521 git fetch --dry-run . &&
522 ! test -f .git/FETCH_HEAD
523 '
524
525 test_expect_success "should be able to fetch with duplicate refspecs" '
526 mkdir dups &&
527 (
528 cd dups &&
529 git init &&
530 git config branch.master.remote three &&
531 git config remote.three.url ../three/.git &&
532 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
533 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
534 git fetch three
535 )
536 '
537
538 # configured prune tests
539
540 set_config_tristate () {
541 # var=$1 val=$2
542 case "$2" in
543 unset) test_unconfig "$1" ;;
544 *) git config "$1" "$2" ;;
545 esac
546 }
547
548 test_configured_prune () {
549 fetch_prune=$1 remote_origin_prune=$2 cmdline=$3 expected=$4
550
551 test_expect_success "prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
552 # make sure a newbranch is there in . and also in one
553 git branch -f newbranch &&
554 (
555 cd one &&
556 test_unconfig fetch.prune &&
557 test_unconfig remote.origin.prune &&
558 git fetch &&
559 git rev-parse --verify refs/remotes/origin/newbranch
560 ) &&
561
562 # now remove it
563 git branch -d newbranch &&
564
565 # then test
566 (
567 cd one &&
568 set_config_tristate fetch.prune $fetch_prune &&
569 set_config_tristate remote.origin.prune $remote_origin_prune &&
570
571 git fetch $cmdline &&
572 case "$expected" in
573 pruned)
574 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
575 ;;
576 kept)
577 git rev-parse --verify refs/remotes/origin/newbranch
578 ;;
579 esac
580 )
581 '
582 }
583
584 test_configured_prune unset unset "" kept
585 test_configured_prune unset unset "--no-prune" kept
586 test_configured_prune unset unset "--prune" pruned
587
588 test_configured_prune false unset "" kept
589 test_configured_prune false unset "--no-prune" kept
590 test_configured_prune false unset "--prune" pruned
591
592 test_configured_prune true unset "" pruned
593 test_configured_prune true unset "--prune" pruned
594 test_configured_prune true unset "--no-prune" kept
595
596 test_configured_prune unset false "" kept
597 test_configured_prune unset false "--no-prune" kept
598 test_configured_prune unset false "--prune" pruned
599
600 test_configured_prune false false "" kept
601 test_configured_prune false false "--no-prune" kept
602 test_configured_prune false false "--prune" pruned
603
604 test_configured_prune true false "" kept
605 test_configured_prune true false "--prune" pruned
606 test_configured_prune true false "--no-prune" kept
607
608 test_configured_prune unset true "" pruned
609 test_configured_prune unset true "--no-prune" kept
610 test_configured_prune unset true "--prune" pruned
611
612 test_configured_prune false true "" pruned
613 test_configured_prune false true "--no-prune" kept
614 test_configured_prune false true "--prune" pruned
615
616 test_configured_prune true true "" pruned
617 test_configured_prune true true "--prune" pruned
618 test_configured_prune true true "--no-prune" kept
619
620 test_expect_success 'all boundary commits are excluded' '
621 test_commit base &&
622 test_commit oneside &&
623 git checkout HEAD^ &&
624 test_commit otherside &&
625 git checkout master &&
626 test_tick &&
627 git merge otherside &&
628 ad=$(git log --no-walk --format=%ad HEAD) &&
629 git bundle create twoside-boundary.bdl master --since="$ad" &&
630 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
631 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
632 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
633 '
634
635 test_expect_success 'fetch --prune prints the remotes url' '
636 git branch goodbye &&
637 git clone . only-prunes &&
638 git branch -D goodbye &&
639 (
640 cd only-prunes &&
641 git fetch --prune origin 2>&1 | head -n1 >../actual
642 ) &&
643 echo "From ${D}/." >expect &&
644 test_i18ncmp expect actual
645 '
646
647 test_expect_success 'branchname D/F conflict resolved by --prune' '
648 git branch dir/file &&
649 git clone . prune-df-conflict &&
650 git branch -D dir/file &&
651 git branch dir &&
652 (
653 cd prune-df-conflict &&
654 git fetch --prune &&
655 git rev-parse origin/dir >../actual
656 ) &&
657 git rev-parse dir >expect &&
658 test_cmp expect actual
659 '
660
661 test_expect_success 'fetching a one-level ref works' '
662 test_commit extra &&
663 git reset --hard HEAD^ &&
664 git update-ref refs/foo extra &&
665 git init one-level &&
666 (
667 cd one-level &&
668 git fetch .. HEAD refs/foo
669 )
670 '
671
672 test_expect_success 'fetching with auto-gc does not lock up' '
673 write_script askyesno <<-\EOF &&
674 echo "$*" &&
675 false
676 EOF
677 git clone "file://$D" auto-gc &&
678 test_commit test2 &&
679 (
680 cd auto-gc &&
681 git config gc.autoPackLimit 1 &&
682 git config gc.autoDetach false &&
683 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
684 ! grep "Should I try again" fetch.out
685 )
686 '
687
688 test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
689 git clone . full-output &&
690 test_commit looooooooooooong-tag &&
691 (
692 cd full-output &&
693 git -c fetch.output=full fetch origin 2>&1 | \
694 grep -e "->" | cut -c 22- >../actual
695 ) &&
696 cat >expect <<-\EOF &&
697 master -> origin/master
698 looooooooooooong-tag -> looooooooooooong-tag
699 EOF
700 test_cmp expect actual
701 '
702
703 test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
704 git clone . compact &&
705 test_commit extraaa &&
706 (
707 cd compact &&
708 git -c fetch.output=compact fetch origin 2>&1 | \
709 grep -e "->" | cut -c 22- >../actual
710 ) &&
711 cat >expect <<-\EOF &&
712 master -> origin/*
713 extraaa -> *
714 EOF
715 test_cmp expect actual
716 '
717
718 test_done