1#!/bin/sh
2# Copyright (c) 2006, Junio C Hamano.
3
4test_description='Per branch config variables affects "git fetch".
5
6'
7
8. ./test-lib.sh
9
10D=$(pwd)
11
12test_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
17convert_bundle_to_pack () {
18 while read x && test -n "$x"
19 do
20 :;
21 done
22 cat
23}
24
25test_expect_success setup '
26 echo >file original &&
27 git add file &&
28 git commit -a -m original'
29
30test_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
60test_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
72test_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
87test_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
97test_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
107test_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
116test_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
136test_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
151test_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
163test_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
177test_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
189test_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
205test_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
232test_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
244test_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
256test_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
263test_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
270test_expect_success 'create bundle 2' '
271 cd "$D" &&
272 git bundle create bundle2 master~2..master
273'
274
275test_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
282test_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
289test_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
295test_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
306test_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
314test_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
323test_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
334test_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
346test_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
355test_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
361test_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
374test_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
381test_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
396test_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
411test_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
419test_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
434test_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
448test_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
463test_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
479test_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
486test_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
506test_expect_success 'refuse to fetch into the current branch' '
507
508 test_must_fail git fetch . side:master
509
510'
511
512test_expect_success 'fetch into the current branch with --update-head-ok' '
513
514 git fetch --update-head-ok . side:master
515
516'
517
518test_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
525test_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
540set_config_tristate () {
541 # var=$1 val=$2
542 case "$2" in
543 unset)
544 test_unconfig "$1"
545 ;;
546 *)
547 git config "$1" "$2"
548 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
549 git_fetch_c="$git_fetch_c -c $key=$2"
550 ;;
551 esac
552}
553
554test_configured_prune () {
555 test_configured_prune_type "$@" "name"
556 test_configured_prune_type "$@" "link"
557}
558
559test_configured_prune_type () {
560 fetch_prune=$1
561 remote_origin_prune=$2
562 fetch_prune_tags=$3
563 remote_origin_prune_tags=$4
564 expected_branch=$5
565 expected_tag=$6
566 cmdline=$7
567 mode=$8
568
569 if test -z "$cmdline_setup"
570 then
571 test_expect_success 'setup cmdline_setup variable for subsequent test' '
572 remote_url="file://$(git -C one config remote.origin.url)" &&
573 remote_fetch="$(git -C one config remote.origin.fetch)" &&
574 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
575 '
576 fi
577
578 if test "$mode" = 'link'
579 then
580 new_cmdline=""
581
582 if test "$cmdline" = ""
583 then
584 new_cmdline=$cmdline_setup
585 else
586 new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
587 fi
588
589 if test "$fetch_prune_tags" = 'true' ||
590 test "$remote_origin_prune_tags" = 'true'
591 then
592 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
593 then
594 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
595 fi
596 fi
597
598 cmdline="$new_cmdline"
599 fi
600
601 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" '
602 # make sure a newbranch is there in . and also in one
603 git branch -f newbranch &&
604 git tag -f newtag &&
605 (
606 cd one &&
607 test_unconfig fetch.prune &&
608 test_unconfig fetch.pruneTags &&
609 test_unconfig remote.origin.prune &&
610 test_unconfig remote.origin.pruneTags &&
611 git fetch '"$cmdline_setup"' &&
612 git rev-parse --verify refs/remotes/origin/newbranch &&
613 git rev-parse --verify refs/tags/newtag
614 ) &&
615
616 # now remove it
617 git branch -d newbranch &&
618 git tag -d newtag &&
619
620 # then test
621 (
622 cd one &&
623 git_fetch_c="" &&
624 set_config_tristate fetch.prune $fetch_prune &&
625 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
626 set_config_tristate remote.origin.prune $remote_origin_prune &&
627 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
628
629 if test "$mode" != "link"
630 then
631 git_fetch_c=""
632 fi &&
633 git$git_fetch_c fetch '"$cmdline"' &&
634 case "$expected_branch" in
635 pruned)
636 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
637 ;;
638 kept)
639 git rev-parse --verify refs/remotes/origin/newbranch
640 ;;
641 esac &&
642 case "$expected_tag" in
643 pruned)
644 test_must_fail git rev-parse --verify refs/tags/newtag
645 ;;
646 kept)
647 git rev-parse --verify refs/tags/newtag
648 ;;
649 esac
650 )
651 '
652}
653
654# $1 config: fetch.prune
655# $2 config: remote.<name>.prune
656# $3 config: fetch.pruneTags
657# $4 config: remote.<name>.pruneTags
658# $5 expect: branch to be pruned?
659# $6 expect: tag to be pruned?
660# $7 git-fetch $cmdline:
661#
662# $1 $2 $3 $4 $5 $6 $7
663test_configured_prune unset unset unset unset kept kept ""
664test_configured_prune unset unset unset unset kept kept "--no-prune"
665test_configured_prune unset unset unset unset pruned kept "--prune"
666test_configured_prune unset unset unset unset kept pruned \
667 "--prune origin refs/tags/*:refs/tags/*"
668test_configured_prune unset unset unset unset pruned pruned \
669 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
670
671test_configured_prune false unset unset unset kept kept ""
672test_configured_prune false unset unset unset kept kept "--no-prune"
673test_configured_prune false unset unset unset pruned kept "--prune"
674
675test_configured_prune true unset unset unset pruned kept ""
676test_configured_prune true unset unset unset pruned kept "--prune"
677test_configured_prune true unset unset unset kept kept "--no-prune"
678
679test_configured_prune unset false unset unset kept kept ""
680test_configured_prune unset false unset unset kept kept "--no-prune"
681test_configured_prune unset false unset unset pruned kept "--prune"
682
683test_configured_prune false false unset unset kept kept ""
684test_configured_prune false false unset unset kept kept "--no-prune"
685test_configured_prune false false unset unset pruned kept "--prune"
686test_configured_prune false false unset unset kept pruned \
687 "--prune origin refs/tags/*:refs/tags/*"
688test_configured_prune false false unset unset pruned pruned \
689 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
690
691test_configured_prune true false unset unset kept kept ""
692test_configured_prune true false unset unset pruned kept "--prune"
693test_configured_prune true false unset unset kept kept "--no-prune"
694
695test_configured_prune unset true unset unset pruned kept ""
696test_configured_prune unset true unset unset kept kept "--no-prune"
697test_configured_prune unset true unset unset pruned kept "--prune"
698
699test_configured_prune false true unset unset pruned kept ""
700test_configured_prune false true unset unset kept kept "--no-prune"
701test_configured_prune false true unset unset pruned kept "--prune"
702
703test_configured_prune true true unset unset pruned kept ""
704test_configured_prune true true unset unset pruned kept "--prune"
705test_configured_prune true true unset unset kept kept "--no-prune"
706test_configured_prune true true unset unset kept pruned \
707 "--prune origin refs/tags/*:refs/tags/*"
708test_configured_prune true true unset unset pruned pruned \
709 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
710
711# --prune-tags on its own does nothing, needs --prune as well, same
712# for for fetch.pruneTags without fetch.prune
713test_configured_prune unset unset unset unset kept kept "--prune-tags"
714test_configured_prune unset unset true unset kept kept ""
715test_configured_prune unset unset unset true kept kept ""
716
717# These will prune the tags
718test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
719test_configured_prune true unset true unset pruned pruned ""
720test_configured_prune unset true unset true pruned pruned ""
721
722# remote.<name>.pruneTags overrides fetch.pruneTags, just like
723# remote.<name>.prune overrides fetch.prune if set.
724test_configured_prune true unset true unset pruned pruned ""
725test_configured_prune false true false true pruned pruned ""
726test_configured_prune true false true false kept kept ""
727
728# When --prune-tags is supplied it's ignored if an explicit refspec is
729# given, same for the configuration options.
730test_configured_prune unset unset unset unset pruned kept \
731 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
732test_configured_prune unset unset true unset pruned kept \
733 "--prune origin +refs/heads/*:refs/remotes/origin/*"
734test_configured_prune unset unset unset true pruned kept \
735 "--prune origin +refs/heads/*:refs/remotes/origin/*"
736
737# Pruning that also takes place if a file:// url replaces a named
738# remote. However, because there's no implicit
739# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
740# command-line negates --prune-tags, the branches will not be pruned.
741test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
742test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
743test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
744test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
745test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
746test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
747test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
748test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
749test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
750test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
751test_configured_prune_type true unset true unset pruned pruned "origin" "name"
752test_configured_prune_type true unset true unset kept pruned "origin" "link"
753test_configured_prune_type unset true true unset pruned pruned "origin" "name"
754test_configured_prune_type unset true true unset kept pruned "origin" "link"
755test_configured_prune_type unset true unset true pruned pruned "origin" "name"
756test_configured_prune_type unset true unset true kept pruned "origin" "link"
757
758# When all remote.origin.fetch settings are deleted a --prune
759# --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
760# tags, but not tracking branches, will be deleted.
761test_expect_success 'remove remote.origin.fetch "one"' '
762 (
763 cd one &&
764 git config --unset-all remote.origin.fetch
765 )
766'
767test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
768test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
769
770test_expect_success 'all boundary commits are excluded' '
771 test_commit base &&
772 test_commit oneside &&
773 git checkout HEAD^ &&
774 test_commit otherside &&
775 git checkout master &&
776 test_tick &&
777 git merge otherside &&
778 ad=$(git log --no-walk --format=%ad HEAD) &&
779 git bundle create twoside-boundary.bdl master --since="$ad" &&
780 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
781 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
782 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
783'
784
785test_expect_success 'fetch --prune prints the remotes url' '
786 git branch goodbye &&
787 git clone . only-prunes &&
788 git branch -D goodbye &&
789 (
790 cd only-prunes &&
791 git fetch --prune origin 2>&1 | head -n1 >../actual
792 ) &&
793 echo "From ${D}/." >expect &&
794 test_i18ncmp expect actual
795'
796
797test_expect_success 'branchname D/F conflict resolved by --prune' '
798 git branch dir/file &&
799 git clone . prune-df-conflict &&
800 git branch -D dir/file &&
801 git branch dir &&
802 (
803 cd prune-df-conflict &&
804 git fetch --prune &&
805 git rev-parse origin/dir >../actual
806 ) &&
807 git rev-parse dir >expect &&
808 test_cmp expect actual
809'
810
811test_expect_success 'fetching a one-level ref works' '
812 test_commit extra &&
813 git reset --hard HEAD^ &&
814 git update-ref refs/foo extra &&
815 git init one-level &&
816 (
817 cd one-level &&
818 git fetch .. HEAD refs/foo
819 )
820'
821
822test_expect_success 'fetching with auto-gc does not lock up' '
823 write_script askyesno <<-\EOF &&
824 echo "$*" &&
825 false
826 EOF
827 git clone "file://$D" auto-gc &&
828 test_commit test2 &&
829 (
830 cd auto-gc &&
831 git config fetch.unpackLimit 1 &&
832 git config gc.autoPackLimit 1 &&
833 git config gc.autoDetach false &&
834 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
835 test_i18ngrep "Auto packing the repository" fetch.out &&
836 ! grep "Should I try again" fetch.out
837 )
838'
839
840test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
841 git clone . full-output &&
842 test_commit looooooooooooong-tag &&
843 (
844 cd full-output &&
845 git -c fetch.output=full fetch origin >actual 2>&1 &&
846 grep -e "->" actual | cut -c 22- >../actual
847 ) &&
848 cat >expect <<-\EOF &&
849 master -> origin/master
850 looooooooooooong-tag -> looooooooooooong-tag
851 EOF
852 test_cmp expect actual
853'
854
855test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
856 git clone . compact &&
857 test_commit extraaa &&
858 (
859 cd compact &&
860 git -c fetch.output=compact fetch origin >actual 2>&1 &&
861 grep -e "->" actual | cut -c 22- >../actual
862 ) &&
863 cat >expect <<-\EOF &&
864 master -> origin/*
865 extraaa -> *
866 EOF
867 test_cmp expect actual
868'
869
870setup_negotiation_tip () {
871 SERVER="$1"
872 URL="$2"
873 USE_PROTOCOL_V2="$3"
874
875 rm -rf "$SERVER" client trace &&
876 git init "$SERVER" &&
877 test_commit -C "$SERVER" alpha_1 &&
878 test_commit -C "$SERVER" alpha_2 &&
879 git -C "$SERVER" checkout --orphan beta &&
880 test_commit -C "$SERVER" beta_1 &&
881 test_commit -C "$SERVER" beta_2 &&
882
883 git clone "$URL" client &&
884
885 if test "$USE_PROTOCOL_V2" -eq 1
886 then
887 git -C "$SERVER" config protocol.version 2 &&
888 git -C client config protocol.version 2
889 fi &&
890
891 test_commit -C "$SERVER" beta_s &&
892 git -C "$SERVER" checkout master &&
893 test_commit -C "$SERVER" alpha_s &&
894 git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
895}
896
897check_negotiation_tip () {
898 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
899 ALPHA_1=$(git -C client rev-parse alpha_1) &&
900 grep "fetch> have $ALPHA_1" trace &&
901 BETA_1=$(git -C client rev-parse beta_1) &&
902 grep "fetch> have $BETA_1" trace &&
903 ALPHA_2=$(git -C client rev-parse alpha_2) &&
904 ! grep "fetch> have $ALPHA_2" trace &&
905 BETA_2=$(git -C client rev-parse beta_2) &&
906 ! grep "fetch> have $BETA_2" trace
907}
908
909test_expect_success '--negotiation-tip limits "have" lines sent' '
910 setup_negotiation_tip server server 0 &&
911 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
912 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
913 origin alpha_s beta_s &&
914 check_negotiation_tip
915'
916
917test_expect_success '--negotiation-tip understands globs' '
918 setup_negotiation_tip server server 0 &&
919 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
920 --negotiation-tip=*_1 \
921 origin alpha_s beta_s &&
922 check_negotiation_tip
923'
924
925test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
926 setup_negotiation_tip server server 0 &&
927 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
928 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
929 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
930 origin alpha_s beta_s &&
931 check_negotiation_tip
932'
933
934. "$TEST_DIRECTORY"/lib-httpd.sh
935start_httpd
936
937test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
938 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
939 "$HTTPD_URL/smart/server" 1 &&
940 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
941 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
942 origin alpha_s beta_s &&
943 check_negotiation_tip
944'
945
946stop_httpd
947
948test_done