]> git.ipfire.org Git - thirdparty/git.git/blob - t/t5510-fetch.sh
Merge branch 'hw/doc-git-dir'
[thirdparty/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 "^$OID_REGEX " 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 git rev-parse --verify 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 git rev-parse --verify refs/heads/two &&
77 git rev-parse --verify 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 '--refmap="" ignores configured refspec' '
178 cd "$TRASH_DIRECTORY" &&
179 git clone "$D" remote-refs &&
180 git -C remote-refs rev-parse remotes/origin/master >old &&
181 git -C remote-refs update-ref refs/remotes/origin/master master~1 &&
182 git -C remote-refs rev-parse remotes/origin/master >new &&
183 git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
184 git -C remote-refs rev-parse remotes/origin/master >actual &&
185 test_cmp new actual &&
186 git -C remote-refs fetch origin &&
187 git -C remote-refs rev-parse remotes/origin/master >actual &&
188 test_cmp old actual
189 '
190
191 test_expect_success '--refmap="" and --prune' '
192 git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch master &&
193 git -C remote-refs update-ref refs/hidden/foo/otherbranch master &&
194 git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
195 git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
196 test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
197 git -C remote-refs fetch --prune origin &&
198 test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
199 '
200
201 test_expect_success 'fetch tags when there is no tags' '
202
203 cd "$D" &&
204
205 mkdir notags &&
206 cd notags &&
207 git init &&
208
209 git fetch -t ..
210
211 '
212
213 test_expect_success 'fetch following tags' '
214
215 cd "$D" &&
216 git tag -a -m 'annotated' anno HEAD &&
217 git tag light HEAD &&
218
219 mkdir four &&
220 cd four &&
221 git init &&
222
223 git fetch .. :track &&
224 git show-ref --verify refs/tags/anno &&
225 git show-ref --verify refs/tags/light
226
227 '
228
229 test_expect_success 'fetch uses remote ref names to describe new refs' '
230 cd "$D" &&
231 git init descriptive &&
232 (
233 cd descriptive &&
234 git config remote.o.url .. &&
235 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
236 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
237 git fetch o
238 ) &&
239 git tag -a -m "Descriptive tag" descriptive-tag &&
240 git branch descriptive-branch &&
241 git checkout descriptive-branch &&
242 echo "Nuts" >crazy &&
243 git add crazy &&
244 git commit -a -m "descriptive commit" &&
245 git update-ref refs/others/crazy HEAD &&
246 (
247 cd descriptive &&
248 git fetch o 2>actual &&
249 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
250 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
251 test_i18ngrep "new ref.* -> crazy$" actual
252 ) &&
253 git checkout master
254 '
255
256 test_expect_success 'fetch must not resolve short tag name' '
257
258 cd "$D" &&
259
260 mkdir five &&
261 cd five &&
262 git init &&
263
264 test_must_fail git fetch .. anno:five
265
266 '
267
268 test_expect_success 'fetch can now resolve short remote name' '
269
270 cd "$D" &&
271 git update-ref refs/remotes/six/HEAD HEAD &&
272
273 mkdir six &&
274 cd six &&
275 git init &&
276
277 git fetch .. six:six
278 '
279
280 test_expect_success 'create bundle 1' '
281 cd "$D" &&
282 echo >file updated again by origin &&
283 git commit -a -m "tip" &&
284 git bundle create bundle1 master^..master
285 '
286
287 test_expect_success 'header of bundle looks right' '
288 head -n 4 "$D"/bundle1 &&
289 head -n 1 "$D"/bundle1 | grep "^#" &&
290 head -n 2 "$D"/bundle1 | grep "^-$OID_REGEX " &&
291 head -n 3 "$D"/bundle1 | grep "^$OID_REGEX " &&
292 head -n 4 "$D"/bundle1 | grep "^$"
293 '
294
295 test_expect_success 'create bundle 2' '
296 cd "$D" &&
297 git bundle create bundle2 master~2..master
298 '
299
300 test_expect_success 'unbundle 1' '
301 cd "$D/bundle" &&
302 git checkout -b some-branch &&
303 test_must_fail git fetch "$D/bundle1" master:master
304 '
305
306
307 test_expect_success 'bundle 1 has only 3 files ' '
308 cd "$D" &&
309 convert_bundle_to_pack <bundle1 >bundle.pack &&
310 git index-pack bundle.pack &&
311 test_bundle_object_count bundle.pack 3
312 '
313
314 test_expect_success 'unbundle 2' '
315 cd "$D/bundle" &&
316 git fetch ../bundle2 master:master &&
317 test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)"
318 '
319
320 test_expect_success 'bundle does not prerequisite objects' '
321 cd "$D" &&
322 touch file2 &&
323 git add file2 &&
324 git commit -m add.file2 file2 &&
325 git bundle create bundle3 -1 HEAD &&
326 convert_bundle_to_pack <bundle3 >bundle.pack &&
327 git index-pack bundle.pack &&
328 test_bundle_object_count bundle.pack 3
329 '
330
331 test_expect_success 'bundle should be able to create a full history' '
332
333 cd "$D" &&
334 git tag -a -m '1.0' v1.0 master &&
335 git bundle create bundle4 v1.0
336
337 '
338
339 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
340 git config branch.master.remote yeti &&
341 git config branch.master.merge refs/heads/bigfoot &&
342 git config remote.blub.url one &&
343 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
344 git fetch blub
345 '
346
347 # URL supplied to fetch does not match the url of the configured branch's remote
348 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
349 one_head=$(cd one && git rev-parse HEAD) &&
350 this_head=$(git rev-parse HEAD) &&
351 git update-ref -d FETCH_HEAD &&
352 git fetch one &&
353 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
354 test $this_head = "$(git rev-parse --verify HEAD)"
355 '
356
357 # URL supplied to fetch matches the url of the configured branch's remote and
358 # the merge spec matches the branch the remote HEAD points to
359 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
360 one_ref=$(cd one && git symbolic-ref HEAD) &&
361 git config branch.master.remote blub &&
362 git config branch.master.merge "$one_ref" &&
363 git update-ref -d FETCH_HEAD &&
364 git fetch one &&
365 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
366 test $this_head = "$(git rev-parse --verify HEAD)"
367 '
368
369 # URL supplied to fetch matches the url of the configured branch's remote, but
370 # the merge spec does not match the branch the remote HEAD points to
371 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
372 git config branch.master.merge "${one_ref}_not" &&
373 git update-ref -d FETCH_HEAD &&
374 git fetch one &&
375 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
376 test $this_head = "$(git rev-parse --verify HEAD)"
377 '
378
379 # the strange name is: a\!'b
380 test_expect_success 'quoting of a strangely named repo' '
381 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
382 cat result &&
383 grep "fatal: '\''a\\\\!'\''b'\''" result
384 '
385
386 test_expect_success 'bundle should record HEAD correctly' '
387
388 cd "$D" &&
389 git bundle create bundle5 HEAD master &&
390 git bundle list-heads bundle5 >actual &&
391 for h in HEAD refs/heads/master
392 do
393 echo "$(git rev-parse --verify $h) $h"
394 done >expect &&
395 test_cmp expect actual
396
397 '
398
399 test_expect_success 'mark initial state of origin/master' '
400 (
401 cd three &&
402 git tag base-origin-master refs/remotes/origin/master
403 )
404 '
405
406 test_expect_success 'explicit fetch should update tracking' '
407
408 cd "$D" &&
409 git branch -f side &&
410 (
411 cd three &&
412 git update-ref refs/remotes/origin/master base-origin-master &&
413 o=$(git rev-parse --verify refs/remotes/origin/master) &&
414 git fetch origin master &&
415 n=$(git rev-parse --verify refs/remotes/origin/master) &&
416 test "$o" != "$n" &&
417 test_must_fail git rev-parse --verify refs/remotes/origin/side
418 )
419 '
420
421 test_expect_success 'explicit pull should update tracking' '
422
423 cd "$D" &&
424 git branch -f side &&
425 (
426 cd three &&
427 git update-ref refs/remotes/origin/master base-origin-master &&
428 o=$(git rev-parse --verify refs/remotes/origin/master) &&
429 git pull origin master &&
430 n=$(git rev-parse --verify refs/remotes/origin/master) &&
431 test "$o" != "$n" &&
432 test_must_fail git rev-parse --verify refs/remotes/origin/side
433 )
434 '
435
436 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
437 cd "$D" &&
438 (
439 cd three &&
440 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
441 )
442 '
443
444 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
445 cd "$D" &&
446 git branch -f side &&
447 (
448 cd three &&
449 git update-ref refs/remotes/origin/master base-origin-master &&
450 o=$(git rev-parse --verify refs/remotes/origin/master) &&
451 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
452 n=$(git rev-parse --verify refs/remotes/origin/master) &&
453 test "$o" = "$n" &&
454 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
455 git rev-parse --verify refs/remotes/other/master
456 )
457 '
458
459 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
460 cd "$D" &&
461 git branch -f side &&
462 (
463 cd three &&
464 git update-ref refs/remotes/origin/master base-origin-master &&
465 o=$(git rev-parse --verify refs/remotes/origin/master) &&
466 git fetch --refmap="" origin master &&
467 n=$(git rev-parse --verify refs/remotes/origin/master) &&
468 test "$o" = "$n" &&
469 test_must_fail git rev-parse --verify refs/remotes/origin/side
470 )
471 '
472
473 test_expect_success 'configured fetch updates tracking' '
474
475 cd "$D" &&
476 git branch -f side &&
477 (
478 cd three &&
479 git update-ref refs/remotes/origin/master base-origin-master &&
480 o=$(git rev-parse --verify refs/remotes/origin/master) &&
481 git fetch origin &&
482 n=$(git rev-parse --verify refs/remotes/origin/master) &&
483 test "$o" != "$n" &&
484 git rev-parse --verify refs/remotes/origin/side
485 )
486 '
487
488 test_expect_success 'non-matching refspecs do not confuse tracking update' '
489 cd "$D" &&
490 git update-ref refs/odd/location HEAD &&
491 (
492 cd three &&
493 git update-ref refs/remotes/origin/master base-origin-master &&
494 git config --add remote.origin.fetch \
495 refs/odd/location:refs/remotes/origin/odd &&
496 o=$(git rev-parse --verify refs/remotes/origin/master) &&
497 git fetch origin master &&
498 n=$(git rev-parse --verify refs/remotes/origin/master) &&
499 test "$o" != "$n" &&
500 test_must_fail git rev-parse --verify refs/remotes/origin/odd
501 )
502 '
503
504 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
505
506 cd "$D" &&
507 test_must_fail git push seven no:no
508
509 '
510
511 test_expect_success 'auto tag following fetches minimum' '
512
513 cd "$D" &&
514 git clone .git follow &&
515 git checkout HEAD^0 &&
516 (
517 for i in 1 2 3 4 5 6 7
518 do
519 echo $i >>file &&
520 git commit -m $i -a &&
521 git tag -a -m $i excess-$i || exit 1
522 done
523 ) &&
524 git checkout master &&
525 (
526 cd follow &&
527 git fetch
528 )
529 '
530
531 test_expect_success 'refuse to fetch into the current branch' '
532
533 test_must_fail git fetch . side:master
534
535 '
536
537 test_expect_success 'fetch into the current branch with --update-head-ok' '
538
539 git fetch --update-head-ok . side:master
540
541 '
542
543 test_expect_success 'fetch --dry-run' '
544
545 rm -f .git/FETCH_HEAD &&
546 git fetch --dry-run . &&
547 ! test -f .git/FETCH_HEAD
548 '
549
550 test_expect_success "should be able to fetch with duplicate refspecs" '
551 mkdir dups &&
552 (
553 cd dups &&
554 git init &&
555 git config branch.master.remote three &&
556 git config remote.three.url ../three/.git &&
557 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
558 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
559 git fetch three
560 )
561 '
562
563 test_expect_success 'LHS of refspec follows ref disambiguation rules' '
564 mkdir lhs-ambiguous &&
565 (
566 cd lhs-ambiguous &&
567 git init server &&
568 test_commit -C server unwanted &&
569 test_commit -C server wanted &&
570
571 git init client &&
572
573 # Check a name coming after "refs" alphabetically ...
574 git -C server update-ref refs/heads/s wanted &&
575 git -C server update-ref refs/heads/refs/heads/s unwanted &&
576 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
577 git -C server rev-parse wanted >expect &&
578 git -C client rev-parse checkthis >actual &&
579 test_cmp expect actual &&
580
581 # ... and one before.
582 git -C server update-ref refs/heads/q wanted &&
583 git -C server update-ref refs/heads/refs/heads/q unwanted &&
584 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
585 git -C server rev-parse wanted >expect &&
586 git -C client rev-parse checkthis >actual &&
587 test_cmp expect actual &&
588
589 # Tags are preferred over branches like refs/{heads,tags}/*
590 git -C server update-ref refs/tags/t wanted &&
591 git -C server update-ref refs/heads/t unwanted &&
592 git -C client fetch ../server +t:refs/heads/checkthis &&
593 git -C server rev-parse wanted >expect &&
594 git -C client rev-parse checkthis >actual
595 )
596 '
597
598 test_expect_success 'fetch.writeCommitGraph' '
599 git clone three write &&
600 (
601 cd three &&
602 test_commit new
603 ) &&
604 (
605 cd write &&
606 git -c fetch.writeCommitGraph fetch origin &&
607 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
608 )
609 '
610
611 test_expect_success 'fetch.writeCommitGraph with submodules' '
612 git clone dups super &&
613 (
614 cd super &&
615 git submodule add "file://$TRASH_DIRECTORY/three" &&
616 git commit -m "add submodule"
617 ) &&
618 git clone "super" super-clone &&
619 (
620 cd super-clone &&
621 rm -rf .git/objects/info &&
622 git -c fetch.writeCommitGraph=true fetch origin &&
623 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
624 )
625 '
626
627 # configured prune tests
628
629 set_config_tristate () {
630 # var=$1 val=$2
631 case "$2" in
632 unset)
633 test_unconfig "$1"
634 ;;
635 *)
636 git config "$1" "$2"
637 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
638 git_fetch_c="$git_fetch_c -c $key=$2"
639 ;;
640 esac
641 }
642
643 test_configured_prune () {
644 test_configured_prune_type "$@" "name"
645 test_configured_prune_type "$@" "link"
646 }
647
648 test_configured_prune_type () {
649 fetch_prune=$1
650 remote_origin_prune=$2
651 fetch_prune_tags=$3
652 remote_origin_prune_tags=$4
653 expected_branch=$5
654 expected_tag=$6
655 cmdline=$7
656 mode=$8
657
658 if test -z "$cmdline_setup"
659 then
660 test_expect_success 'setup cmdline_setup variable for subsequent test' '
661 remote_url="file://$(git -C one config remote.origin.url)" &&
662 remote_fetch="$(git -C one config remote.origin.fetch)" &&
663 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
664 '
665 fi
666
667 if test "$mode" = 'link'
668 then
669 new_cmdline=""
670
671 if test "$cmdline" = ""
672 then
673 new_cmdline=$cmdline_setup
674 else
675 new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
676 fi
677
678 if test "$fetch_prune_tags" = 'true' ||
679 test "$remote_origin_prune_tags" = 'true'
680 then
681 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
682 then
683 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
684 fi
685 fi
686
687 cmdline="$new_cmdline"
688 fi
689
690 test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" '
691 # make sure a newbranch is there in . and also in one
692 git branch -f newbranch &&
693 git tag -f newtag &&
694 (
695 cd one &&
696 test_unconfig fetch.prune &&
697 test_unconfig fetch.pruneTags &&
698 test_unconfig remote.origin.prune &&
699 test_unconfig remote.origin.pruneTags &&
700 git fetch '"$cmdline_setup"' &&
701 git rev-parse --verify refs/remotes/origin/newbranch &&
702 git rev-parse --verify refs/tags/newtag
703 ) &&
704
705 # now remove them
706 git branch -d newbranch &&
707 git tag -d newtag &&
708
709 # then test
710 (
711 cd one &&
712 git_fetch_c="" &&
713 set_config_tristate fetch.prune $fetch_prune &&
714 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
715 set_config_tristate remote.origin.prune $remote_origin_prune &&
716 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
717
718 if test "$mode" != "link"
719 then
720 git_fetch_c=""
721 fi &&
722 git$git_fetch_c fetch '"$cmdline"' &&
723 case "$expected_branch" in
724 pruned)
725 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
726 ;;
727 kept)
728 git rev-parse --verify refs/remotes/origin/newbranch
729 ;;
730 esac &&
731 case "$expected_tag" in
732 pruned)
733 test_must_fail git rev-parse --verify refs/tags/newtag
734 ;;
735 kept)
736 git rev-parse --verify refs/tags/newtag
737 ;;
738 esac
739 )
740 '
741 }
742
743 # $1 config: fetch.prune
744 # $2 config: remote.<name>.prune
745 # $3 config: fetch.pruneTags
746 # $4 config: remote.<name>.pruneTags
747 # $5 expect: branch to be pruned?
748 # $6 expect: tag to be pruned?
749 # $7 git-fetch $cmdline:
750 #
751 # $1 $2 $3 $4 $5 $6 $7
752 test_configured_prune unset unset unset unset kept kept ""
753 test_configured_prune unset unset unset unset kept kept "--no-prune"
754 test_configured_prune unset unset unset unset pruned kept "--prune"
755 test_configured_prune unset unset unset unset kept pruned \
756 "--prune origin refs/tags/*:refs/tags/*"
757 test_configured_prune unset unset unset unset pruned pruned \
758 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
759
760 test_configured_prune false unset unset unset kept kept ""
761 test_configured_prune false unset unset unset kept kept "--no-prune"
762 test_configured_prune false unset unset unset pruned kept "--prune"
763
764 test_configured_prune true unset unset unset pruned kept ""
765 test_configured_prune true unset unset unset pruned kept "--prune"
766 test_configured_prune true unset unset unset kept kept "--no-prune"
767
768 test_configured_prune unset false unset unset kept kept ""
769 test_configured_prune unset false unset unset kept kept "--no-prune"
770 test_configured_prune unset false unset unset pruned kept "--prune"
771
772 test_configured_prune false false unset unset kept kept ""
773 test_configured_prune false false unset unset kept kept "--no-prune"
774 test_configured_prune false false unset unset pruned kept "--prune"
775 test_configured_prune false false unset unset kept pruned \
776 "--prune origin refs/tags/*:refs/tags/*"
777 test_configured_prune false false unset unset pruned pruned \
778 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
779
780 test_configured_prune true false unset unset kept kept ""
781 test_configured_prune true false unset unset pruned kept "--prune"
782 test_configured_prune true false unset unset kept kept "--no-prune"
783
784 test_configured_prune unset true unset unset pruned kept ""
785 test_configured_prune unset true unset unset kept kept "--no-prune"
786 test_configured_prune unset true unset unset pruned kept "--prune"
787
788 test_configured_prune false true unset unset pruned kept ""
789 test_configured_prune false true unset unset kept kept "--no-prune"
790 test_configured_prune false true unset unset pruned kept "--prune"
791
792 test_configured_prune true true unset unset pruned kept ""
793 test_configured_prune true true unset unset pruned kept "--prune"
794 test_configured_prune true true unset unset kept kept "--no-prune"
795 test_configured_prune true true unset unset kept pruned \
796 "--prune origin refs/tags/*:refs/tags/*"
797 test_configured_prune true true unset unset pruned pruned \
798 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
799
800 # --prune-tags on its own does nothing, needs --prune as well, same
801 # for for fetch.pruneTags without fetch.prune
802 test_configured_prune unset unset unset unset kept kept "--prune-tags"
803 test_configured_prune unset unset true unset kept kept ""
804 test_configured_prune unset unset unset true kept kept ""
805
806 # These will prune the tags
807 test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
808 test_configured_prune true unset true unset pruned pruned ""
809 test_configured_prune unset true unset true pruned pruned ""
810
811 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
812 # remote.<name>.prune overrides fetch.prune if set.
813 test_configured_prune true unset true unset pruned pruned ""
814 test_configured_prune false true false true pruned pruned ""
815 test_configured_prune true false true false kept kept ""
816
817 # When --prune-tags is supplied it's ignored if an explicit refspec is
818 # given, same for the configuration options.
819 test_configured_prune unset unset unset unset pruned kept \
820 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
821 test_configured_prune unset unset true unset pruned kept \
822 "--prune origin +refs/heads/*:refs/remotes/origin/*"
823 test_configured_prune unset unset unset true pruned kept \
824 "--prune origin +refs/heads/*:refs/remotes/origin/*"
825
826 # Pruning that also takes place if a file:// url replaces a named
827 # remote. However, because there's no implicit
828 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
829 # command-line negates --prune-tags, the branches will not be pruned.
830 test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
831 test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
832 test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
833 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
834 test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
835 test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
836 test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
837 test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
838 test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
839 test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
840 test_configured_prune_type true unset true unset pruned pruned "origin" "name"
841 test_configured_prune_type true unset true unset kept pruned "origin" "link"
842 test_configured_prune_type unset true true unset pruned pruned "origin" "name"
843 test_configured_prune_type unset true true unset kept pruned "origin" "link"
844 test_configured_prune_type unset true unset true pruned pruned "origin" "name"
845 test_configured_prune_type unset true unset true kept pruned "origin" "link"
846
847 # When all remote.origin.fetch settings are deleted a --prune
848 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
849 # tags, but not tracking branches, will be deleted.
850 test_expect_success 'remove remote.origin.fetch "one"' '
851 (
852 cd one &&
853 git config --unset-all remote.origin.fetch
854 )
855 '
856 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
857 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
858
859 test_expect_success 'all boundary commits are excluded' '
860 test_commit base &&
861 test_commit oneside &&
862 git checkout HEAD^ &&
863 test_commit otherside &&
864 git checkout master &&
865 test_tick &&
866 git merge otherside &&
867 ad=$(git log --no-walk --format=%ad HEAD) &&
868 git bundle create twoside-boundary.bdl master --since="$ad" &&
869 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
870 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
871 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
872 '
873
874 test_expect_success 'fetch --prune prints the remotes url' '
875 git branch goodbye &&
876 git clone . only-prunes &&
877 git branch -D goodbye &&
878 (
879 cd only-prunes &&
880 git fetch --prune origin 2>&1 | head -n1 >../actual
881 ) &&
882 echo "From ${D}/." >expect &&
883 test_i18ncmp expect actual
884 '
885
886 test_expect_success 'branchname D/F conflict resolved by --prune' '
887 git branch dir/file &&
888 git clone . prune-df-conflict &&
889 git branch -D dir/file &&
890 git branch dir &&
891 (
892 cd prune-df-conflict &&
893 git fetch --prune &&
894 git rev-parse origin/dir >../actual
895 ) &&
896 git rev-parse dir >expect &&
897 test_cmp expect actual
898 '
899
900 test_expect_success 'fetching a one-level ref works' '
901 test_commit extra &&
902 git reset --hard HEAD^ &&
903 git update-ref refs/foo extra &&
904 git init one-level &&
905 (
906 cd one-level &&
907 git fetch .. HEAD refs/foo
908 )
909 '
910
911 test_expect_success 'fetching with auto-gc does not lock up' '
912 write_script askyesno <<-\EOF &&
913 echo "$*" &&
914 false
915 EOF
916 git clone "file://$D" auto-gc &&
917 test_commit test2 &&
918 (
919 cd auto-gc &&
920 git config fetch.unpackLimit 1 &&
921 git config gc.autoPackLimit 1 &&
922 git config gc.autoDetach false &&
923 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
924 test_i18ngrep "Auto packing the repository" fetch.out &&
925 ! grep "Should I try again" fetch.out
926 )
927 '
928
929 test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
930 git clone . full-output &&
931 test_commit looooooooooooong-tag &&
932 (
933 cd full-output &&
934 git -c fetch.output=full fetch origin >actual 2>&1 &&
935 grep -e "->" actual | cut -c 22- >../actual
936 ) &&
937 cat >expect <<-\EOF &&
938 master -> origin/master
939 looooooooooooong-tag -> looooooooooooong-tag
940 EOF
941 test_cmp expect actual
942 '
943
944 test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
945 git clone . compact &&
946 test_commit extraaa &&
947 (
948 cd compact &&
949 git -c fetch.output=compact fetch origin >actual 2>&1 &&
950 grep -e "->" actual | cut -c 22- >../actual
951 ) &&
952 cat >expect <<-\EOF &&
953 master -> origin/*
954 extraaa -> *
955 EOF
956 test_cmp expect actual
957 '
958
959 test_expect_success '--no-show-forced-updates' '
960 mkdir forced-updates &&
961 (
962 cd forced-updates &&
963 git init &&
964 test_commit 1 &&
965 test_commit 2
966 ) &&
967 git clone forced-updates forced-update-clone &&
968 git clone forced-updates no-forced-update-clone &&
969 git -C forced-updates reset --hard HEAD~1 &&
970 (
971 cd forced-update-clone &&
972 git fetch --show-forced-updates origin 2>output &&
973 test_i18ngrep "(forced update)" output
974 ) &&
975 (
976 cd no-forced-update-clone &&
977 git fetch --no-show-forced-updates origin 2>output &&
978 test_i18ngrep ! "(forced update)" output
979 )
980 '
981
982 setup_negotiation_tip () {
983 SERVER="$1"
984 URL="$2"
985 USE_PROTOCOL_V2="$3"
986
987 rm -rf "$SERVER" client trace &&
988 git init "$SERVER" &&
989 test_commit -C "$SERVER" alpha_1 &&
990 test_commit -C "$SERVER" alpha_2 &&
991 git -C "$SERVER" checkout --orphan beta &&
992 test_commit -C "$SERVER" beta_1 &&
993 test_commit -C "$SERVER" beta_2 &&
994
995 git clone "$URL" client &&
996
997 if test "$USE_PROTOCOL_V2" -eq 1
998 then
999 git -C "$SERVER" config protocol.version 2 &&
1000 git -C client config protocol.version 2
1001 fi &&
1002
1003 test_commit -C "$SERVER" beta_s &&
1004 git -C "$SERVER" checkout master &&
1005 test_commit -C "$SERVER" alpha_s &&
1006 git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
1007 }
1008
1009 check_negotiation_tip () {
1010 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
1011 ALPHA_1=$(git -C client rev-parse alpha_1) &&
1012 grep "fetch> have $ALPHA_1" trace &&
1013 BETA_1=$(git -C client rev-parse beta_1) &&
1014 grep "fetch> have $BETA_1" trace &&
1015 ALPHA_2=$(git -C client rev-parse alpha_2) &&
1016 ! grep "fetch> have $ALPHA_2" trace &&
1017 BETA_2=$(git -C client rev-parse beta_2) &&
1018 ! grep "fetch> have $BETA_2" trace
1019 }
1020
1021 test_expect_success '--negotiation-tip limits "have" lines sent' '
1022 setup_negotiation_tip server server 0 &&
1023 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1024 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1025 origin alpha_s beta_s &&
1026 check_negotiation_tip
1027 '
1028
1029 test_expect_success '--negotiation-tip understands globs' '
1030 setup_negotiation_tip server server 0 &&
1031 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1032 --negotiation-tip=*_1 \
1033 origin alpha_s beta_s &&
1034 check_negotiation_tip
1035 '
1036
1037 test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
1038 setup_negotiation_tip server server 0 &&
1039 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1040 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1041 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1042 origin alpha_s beta_s &&
1043 check_negotiation_tip
1044 '
1045
1046 . "$TEST_DIRECTORY"/lib-httpd.sh
1047 start_httpd
1048
1049 test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1050 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1051 "$HTTPD_URL/smart/server" 1 &&
1052 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1053 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1054 origin alpha_s beta_s &&
1055 check_negotiation_tip
1056 '
1057
1058 # DO NOT add non-httpd-specific tests here, because the last part of this
1059 # test script is only executed when httpd is available and enabled.
1060
1061 test_done