3 # Copyright (c) 2005 Johannes Schindelin
6 test_description
='Testing multi_ack pack fetching'
10 # Test fetch-pack/upload-pack pair.
12 # Some convenience functions
17 branch
=$
(echo $name |
sed -e 's/^\(.\).*$/\1/') &&
22 parents
="$parents -p $1" &&
26 echo "$text" > test.txt
&&
27 git update-index
--add test.txt
&&
28 tree
=$
(git write-tree
) &&
29 # make sure timestamps are in correct order
31 commit
=$
(echo "$text" | git commit-tree
$tree $parents) &&
32 eval "$name=$commit; export $name" &&
33 git update-ref
"refs/heads/$branch" "$commit" &&
34 eval ${branch}TIP
=$commit
41 test_expect_success
"$number pull" '
44 git fetch-pack -k -v .. $heads &&
48 git update-ref refs/heads/A "$ATIP";;
51 git update-ref refs/heads/B "$BTIP";;
54 git symbolic-ref HEAD refs/heads/$(
56 sed -e "s/^\(.\).*$/\1/"
61 mv .git/objects/pack/pack-* . &&
62 p=$(ls -1 pack-*.pack) &&
63 git unpack-objects <$p &&
66 idx=$(echo pack-*.idx) &&
67 pack_count=$(git show-index <$idx | wc -l) &&
68 test $pack_count = $count &&
74 # Here begins the actual testing
76 # A1 - ... - A20 - A21
80 # client pulls A20, B1. Then tracks only B. Then pulls A.
82 test_expect_success
'setup' '
87 git config transfer.unpacklimit 0
92 while [ $cur -le 10 ]; do
93 add A$cur $(eval echo \$A$prev) &&
98 git update-ref refs/heads/A "$ATIP" &&
99 git update-ref refs/heads/B "$BTIP" &&
100 git symbolic-ref HEAD refs/heads/B
103 pull_to_client
1st
"refs/heads/B refs/heads/A" $
((11*3))
105 test_expect_success
'post 1st pull setup' '
109 while [ $cur -le 65 ]; do
110 add B$cur $(eval echo \$B$prev) &&
116 pull_to_client
2nd
"refs/heads/B" $
((64*3))
118 pull_to_client
3rd
"refs/heads/A" $
((1*3))
120 test_expect_success
'single branch clone' '
121 git clone --single-branch "file://$(pwd)/." singlebranch
124 test_expect_success
'single branch object count' '
125 GIT_DIR=singlebranch/.git git count-objects -v |
126 grep "^in-pack:" > count.singlebranch &&
127 echo "in-pack: 198" >expected &&
128 test_cmp expected count.singlebranch
131 test_expect_success
'single given branch clone' '
132 git clone --single-branch --branch A "file://$(pwd)/." branch-a &&
133 test_must_fail git --git-dir=branch-a/.git rev-parse origin/B
136 test_expect_success
'clone shallow depth 1' '
137 git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0 &&
138 test "$(git --git-dir=shallow0/.git rev-list --count HEAD)" = 1
141 test_expect_success
'clone shallow depth 1 with fsck' '
142 git config --global fetch.fsckobjects true &&
143 git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0fsck &&
144 test "$(git --git-dir=shallow0fsck/.git rev-list --count HEAD)" = 1 &&
145 git config --global --unset fetch.fsckobjects
148 test_expect_success
'clone shallow' '
149 git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow
152 test_expect_success
'clone shallow depth count' '
153 test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 2
156 test_expect_success
'clone shallow object count' '
161 grep "^in-pack: 12" count.shallow
164 test_expect_success
'clone shallow object count (part 2)' '
165 sed -e "/^in-pack:/d" -e "/^packs:/d" -e "/^size-pack:/d" \
166 -e "/: 0$/d" count.shallow > count_output &&
167 test_must_be_empty count_output
170 test_expect_success
'fsck in shallow repo' '
177 test_expect_success
'simple fetch in shallow repo' '
184 test_expect_success
'no changes expected' '
188 ) > count.shallow.2 &&
189 cmp count.shallow count.shallow.2
192 test_expect_success
'fetch same depth in shallow repo' '
199 test_expect_success
'no changes expected' '
203 ) > count.shallow.3 &&
204 cmp count.shallow count.shallow.3
207 test_expect_success
'add two more' '
212 test_expect_success
'pull in shallow repo' '
219 test_expect_success
'clone shallow object count' '
224 grep "^count: 6" count.shallow
227 test_expect_success
'add two more (part 2)' '
232 test_expect_success
'deepening pull in shallow repo' '
235 git pull --depth 4 .. B
239 test_expect_success
'clone shallow object count' '
244 grep "^count: 12" count.shallow
247 test_expect_success
'deepening fetch in shallow repo' '
250 git fetch --depth 4 .. A:A
254 test_expect_success
'clone shallow object count' '
259 grep "^count: 18" count.shallow
262 test_expect_success
'pull in shallow repo with missing merge base' '
265 git fetch --depth 4 .. A &&
266 test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
270 test_expect_success
'additional simple shallow deepenings' '
273 git fetch --depth=8 &&
274 git fetch --depth=10 &&
279 test_expect_success
'clone shallow depth count' '
280 test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 11
283 test_expect_success
'clone shallow object count' '
289 grep "^count: 54" count.shallow
292 test_expect_success
'fetch --no-shallow on full repo' '
293 test_must_fail git fetch --noshallow
296 test_expect_success
'fetch --depth --no-shallow' '
299 test_must_fail git fetch --depth=1 --noshallow
303 test_expect_success
'turn shallow to complete repository' '
306 git fetch --unshallow &&
307 ! test -f .git/shallow &&
312 test_expect_success
'clone shallow without --no-single-branch' '
313 git clone --depth 1 "file://$(pwd)/." shallow2
316 test_expect_success
'clone shallow object count' '
320 ) > count.shallow2 &&
321 grep "^in-pack: 3" count.shallow2
324 test_expect_success
'clone shallow with --branch' '
325 git clone --depth 1 --branch A "file://$(pwd)/." shallow3
328 test_expect_success
'clone shallow object count' '
329 echo "in-pack: 3" > count3.expected &&
330 GIT_DIR=shallow3/.git git count-objects -v |
331 grep "^in-pack" > count3.actual &&
332 test_cmp count3.expected count3.actual
335 test_expect_success
'clone shallow with detached HEAD' '
336 git checkout HEAD^ &&
337 git clone --depth 1 "file://$(pwd)/." shallow5 &&
339 GIT_DIR=shallow5/.git git rev-parse HEAD >actual &&
340 git rev-parse HEAD^ >expected &&
341 test_cmp expected actual
344 test_expect_success
'shallow clone pulling tags' '
345 git tag -a -m A TAGA1 A &&
346 git tag -a -m B TAGB1 B &&
349 git clone --depth 1 "file://$(pwd)/." shallow6 &&
351 cat >taglist.expected <<\EOF &&
355 GIT_DIR=shallow6/.git git tag -l >taglist.actual &&
356 test_cmp taglist.expected taglist.actual &&
358 echo "in-pack: 4" > count6.expected &&
359 GIT_DIR=shallow6/.git git count-objects -v |
360 grep "^in-pack" > count6.actual &&
361 test_cmp count6.expected count6.actual
364 test_expect_success
'shallow cloning single tag' '
365 git clone --depth 1 --branch=TAGB1 "file://$(pwd)/." shallow7 &&
366 cat >taglist.expected <<\EOF &&
370 GIT_DIR=shallow7/.git git tag -l >taglist.actual &&
371 test_cmp taglist.expected taglist.actual &&
373 echo "in-pack: 4" > count7.expected &&
374 GIT_DIR=shallow7/.git git count-objects -v |
375 grep "^in-pack" > count7.actual &&
376 test_cmp count7.expected count7.actual
379 test_expect_success
'clone shallow with packed refs' '
380 git pack-refs --all &&
381 git clone --depth 1 --branch A "file://$(pwd)/." shallow8 &&
382 echo "in-pack: 4" > count8.expected &&
383 GIT_DIR=shallow8/.git git count-objects -v |
384 grep "^in-pack" > count8.actual &&
385 test_cmp count8.expected count8.actual
388 test_expect_success
'fetch in shallow repo unreachable shallow objects' '
390 git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog &&
391 git clone --depth 1 "file://$(pwd)/no-reflog" shallow9 &&
393 git tag -d TAGB1 TAGB2 &&
394 git update-ref refs/heads/B B~~ &&
395 git gc --prune=now &&
398 git fsck --no-dangling
401 test_expect_success
'fetch creating new shallow root' '
403 git clone "file://$(pwd)/." shallow10 &&
404 git commit --allow-empty -m empty &&
406 git fetch --depth=1 --progress 2>actual &&
407 # This should fetch only the empty commit, no tree or
409 test_i18ngrep "remote: Total 1" actual
413 test_expect_success
'setup tests for the --stdin parameter' '
418 for head in A B C D E F
422 cat >input <<-\EOF &&
434 sort <input >expect &&
442 test_expect_success
'setup fetch refs from cmdline v[12]' '
443 cp -r client client1 &&
447 for version
in '' 1 2
449 test_expect_success
"protocol.version=$version fetch refs from cmdline" "
452 GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. \$(cat ../input)
454 cut -d ' ' -f 2 <output | sort >actual &&
455 test_cmp expect actual
459 test_expect_success
'fetch refs from stdin' '
462 git fetch-pack --stdin --no-progress .. <../input
464 cut -d " " -f 2 <output | sort >actual &&
465 test_cmp expect actual
468 test_expect_success
'fetch mixed refs from cmdline and stdin' '
471 tail -n +5 ../input |
472 git fetch-pack --stdin --no-progress .. $(head -n 4 ../input)
474 cut -d " " -f 2 <output | sort >actual &&
475 test_cmp expect actual
478 test_expect_success
'test duplicate refs from stdin' '
481 git fetch-pack --stdin --no-progress .. <../input.dup
483 cut -d " " -f 2 <output | sort >actual &&
484 test_cmp expect actual
487 test_expect_success
'set up tests of missing reference' '
488 cat >expect-error <<-\EOF
489 error: no such remote ref refs/heads/xyzzy
493 test_expect_success
'test lonely missing ref' '
496 test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
498 test_i18ncmp expect-error error-m
501 test_expect_success
'test missing ref after existing' '
504 test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
506 test_i18ncmp expect-error error-em
509 test_expect_success
'test missing ref before existing' '
512 test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
514 test_i18ncmp expect-error error-me
517 test_expect_success
'test --all, --depth, and explicit head' '
520 git fetch-pack --no-progress --all --depth=1 .. refs/heads/A
521 ) >out-adh 2>error-adh
524 test_expect_success
'test --all, --depth, and explicit tag' '
525 git tag OLDTAG refs/heads/B~5 &&
528 git fetch-pack --no-progress --all --depth=1 .. refs/tags/OLDTAG
529 ) >out-adt 2>error-adt
532 test_expect_success
'test --all with tag to non-tip' '
533 git commit --allow-empty -m non-tip &&
534 git commit --allow-empty -m tip &&
535 git tag -m "annotated" non-tip HEAD^ &&
538 git fetch-pack --all ..
542 test_expect_success
'test --all wrt tag to non-commits' '
543 # create tag-to-{blob,tree,commit,tag}, making sure all tagged objects
544 # are reachable only via created tag references.
545 blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
546 git tag -a -m "tag -> blob" tag-to-blob $blob &&
548 tree=$(printf "100644 blob $blob\tfile" | git mktree) &&
549 git tag -a -m "tag -> tree" tag-to-tree $tree &&
551 tree2=$(printf "100644 blob $blob\tfile2" | git mktree) &&
552 commit=$(git commit-tree -m "hello commit" $tree) &&
553 git tag -a -m "tag -> commit" tag-to-commit $commit &&
555 blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) &&
556 tag=$(git mktag <<-EOF
560 tagger author A U Thor <author@example.com> 0 +0000
565 git tag -a -m "tag -> tag" tag-to-tag $tag &&
567 # `fetch-pack --all` should succeed fetching all those objects.
572 git fetch-pack --all .. &&
573 git cat-file blob $blob >/dev/null &&
574 git cat-file tree $tree >/dev/null &&
575 git cat-file commit $commit >/dev/null &&
576 git cat-file tag $tag >/dev/null
580 test_expect_success
'shallow fetch with tags does not break the repository' '
591 git fetch --depth=2 ../.git master:branch &&
596 test_expect_success
'fetch-pack can fetch a raw sha1' '
602 git update-ref refs/hidden/one HEAD^ &&
603 git config transfer.hiderefs refs/hidden &&
604 git config uploadpack.allowtipsha1inwant true
606 git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
609 test_expect_success
'fetch-pack can fetch a raw sha1 that is advertised as a ref' '
610 rm -rf server client &&
612 test_commit -C server 1 &&
615 git -C client fetch-pack ../server \
616 $(git -C server rev-parse refs/heads/master)
619 test_expect_success
'fetch-pack can fetch a raw sha1 overlapping a named ref' '
620 rm -rf server client &&
622 test_commit -C server 1 &&
623 test_commit -C server 2 &&
626 git -C client fetch-pack ../server \
627 $(git -C server rev-parse refs/tags/1) refs/tags/1
630 test_expect_success
'fetch-pack cannot fetch a raw sha1 that is not advertised as a ref' '
634 test_commit -C server 5 &&
635 git -C server tag -d 5 &&
636 test_commit -C server 6 &&
639 test_must_fail git -C client fetch-pack ../server \
640 $(git -C server rev-parse refs/heads/master^) 2>err &&
641 test_i18ngrep "Server does not allow request for unadvertised object" err
645 cat >expected
<<-EOF &&
650 git fetch-pack
--diag-url "$1" |
grep -v hostandport
= >actual
&&
651 test_cmp expected actual
654 check_prot_host_port_path
() {
659 ehost
=$
(echo $3 |
tr -d "[]")
660 diagport
="Diag: port=$4"
665 ehost
=$
(echo $3$4 |
sed -e "s/22$/:22/" -e "s/NONE//")
676 grep -v "^$" exp
>expected
677 git fetch-pack
--diag-url "$1" >actual
&&
678 test_cmp expected actual
681 for r
in repo re
:po re
/po
683 # git or ssh with scheme
684 for p
in "ssh+git" "git+ssh" git
ssh
686 for h
in host user@
host user@
[::1] user@
::1
690 test_expect_success
"fetch-pack --diag-url $p://$h$c/$r" '
691 check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
693 # "/~" -> "~" conversion
694 test_expect_success
"fetch-pack --diag-url $p://$h$c/~$r" '
695 check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
699 for h
in host User@
host User@
[::1]
701 test_expect_success
"fetch-pack --diag-url $p://$h:22/$r" '
702 check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
709 test_expect_success
"fetch-pack --diag-url $p://$h/$r" '
710 check_prot_path $p://$h/$r $p "/$r"
712 # No "/~" -> "~" conversion for file
713 test_expect_success
"fetch-pack --diag-url $p://$h/~$r" '
714 check_prot_path $p://$h/~$r $p "/~$r"
717 # file without scheme
718 for h
in nohost nohost
:12 [::1] [::1]:23 [ [:aa
720 test_expect_success
"fetch-pack --diag-url ./$h:$r" '
721 check_prot_path ./$h:$r $p "./$h:$r"
723 # No "/~" -> "~" conversion for file
724 test_expect_success
"fetch-pack --diag-url ./$p:$h/~$r" '
725 check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
732 test_expect_success
"fetch-pack --diag-url $h:$r" '
733 check_prot_host_port_path $h:$r $p "$h" NONE "$r"
735 # Do "/~" -> "~" conversion
736 test_expect_success
"fetch-pack --diag-url $h:/~$r" '
737 check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
742 test_expect_success MINGW
'fetch-pack --diag-url file://c:/repo' '
743 check_prot_path file://c:/repo file c:/repo
745 test_expect_success MINGW
'fetch-pack --diag-url c:repo' '
746 check_prot_path c:repo file c:repo
749 test_expect_success
'clone shallow since ...' '
750 test_create_repo shallow-since &&
753 GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
754 GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
755 GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
756 git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
757 git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
758 echo three >expected &&
759 test_cmp expected actual
763 test_expect_success
'fetch shallow since ...' '
764 git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
765 git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
766 cat >expected <<-\EOF &&
770 test_cmp expected actual
773 test_expect_success
'clone shallow since selects no commits' '
774 test_create_repo shallow-since-the-future &&
776 cd shallow-since-the-future &&
777 GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
778 GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
779 GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
780 test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
784 test_expect_success
'shallow clone exclude tag two' '
785 test_create_repo shallow-exclude &&
787 cd shallow-exclude &&
791 git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
792 git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
793 echo three >expected &&
794 test_cmp expected actual
798 test_expect_success
'fetch exclude tag one' '
799 git -C shallow12 fetch --shallow-exclude one origin &&
800 git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
801 test_write_lines three two >expected &&
802 test_cmp expected actual
805 test_expect_success
'fetching deepen' '
806 test_create_repo shallow-deepen &&
812 git clone --depth 1 "file://$(pwd)/." deepen &&
814 git -C deepen log --pretty=tformat:%s master >actual &&
815 echo three >expected &&
816 test_cmp expected actual &&
817 git -C deepen fetch --deepen=1 &&
818 git -C deepen log --pretty=tformat:%s origin/master >actual &&
819 cat >expected <<-\EOF &&
824 test_cmp expected actual
828 test_expect_success
'use ref advertisement to prune "have" lines sent' '
829 rm -rf server client &&
831 test_commit -C server both_have_1 &&
832 git -C server tag -d both_have_1 &&
833 test_commit -C server both_have_2 &&
835 git clone server client &&
836 test_commit -C server server_has &&
837 test_commit -C client client_has &&
839 # In both protocol v0 and v2, ensure that the parent of both_have_2 is
840 # not sent as a "have" line. The client should know that the server has
841 # both_have_2, so it only needs to inform the server that it has
842 # both_have_2, and the server can infer the rest.
845 cp -r client clientv0 &&
846 GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv0 \
847 fetch origin server_has both_have_2 &&
848 grep "have $(git -C client rev-parse client_has)" trace &&
849 grep "have $(git -C client rev-parse both_have_2)" trace &&
850 ! grep "have $(git -C client rev-parse both_have_2^)" trace &&
853 cp -r client clientv2 &&
854 GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv2 -c protocol.version=2 \
855 fetch origin server_has both_have_2 &&
856 grep "have $(git -C client rev-parse client_has)" trace &&
857 grep "have $(git -C client rev-parse both_have_2)" trace &&
858 ! grep "have $(git -C client rev-parse both_have_2^)" trace
861 test_expect_success
'filtering by size' '
862 rm -rf server client &&
863 test_create_repo server &&
864 test_commit -C server one &&
865 test_config -C server uploadpack.allowfilter 1 &&
867 test_create_repo client &&
868 git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
870 # Ensure that object is not inadvertently fetched
871 test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
874 test_expect_success
'filtering by size has no effect if support for it is not advertised' '
875 rm -rf server client &&
876 test_create_repo server &&
877 test_commit -C server one &&
879 test_create_repo client &&
880 git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
882 # Ensure that object is fetched
883 git -C client cat-file -e $(git hash-object server/one.t) &&
885 test_i18ngrep "filtering not recognized by server" err
888 fetch_filter_blob_limit_zero
() {
892 rm -rf "$SERVER" client
&&
893 test_create_repo
"$SERVER" &&
894 test_commit
-C "$SERVER" one
&&
895 test_config
-C "$SERVER" uploadpack.allowfilter
1 &&
897 git clone
"$URL" client
&&
898 test_config
-C client extensions.partialclone origin
&&
900 test_commit
-C "$SERVER" two
&&
902 git
-C client fetch
--filter=blob
:limit
=0 origin HEAD
:somewhere
&&
904 # Ensure that commit is fetched, but blob is not
905 test_config
-C client extensions.partialclone
"arbitrary string" &&
906 git
-C client cat-file
-e $
(git
-C "$SERVER" rev-parse two
) &&
907 test_must_fail git
-C client cat-file
-e $
(git hash-object
"$SERVER/two.t")
910 test_expect_success
'fetch with --filter=blob:limit=0' '
911 fetch_filter_blob_limit_zero server server
914 .
"$TEST_DIRECTORY"/lib-httpd.sh
917 test_expect_success
'fetch with --filter=blob:limit=0 and HTTP' '
918 fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"