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";;
53 git symbolic-ref HEAD refs/heads/$(echo $heads \
54 | sed -e "s/^\(.\).*$/\1/") &&
58 mv .git/objects/pack/pack-* . &&
59 p=$(ls -1 pack-*.pack) &&
60 git unpack-objects <$p &&
63 idx=$(echo pack-*.idx) &&
64 pack_count=$(git show-index <$idx | wc -l) &&
65 test $pack_count = $count &&
71 # Here begins the actual testing
73 # A1 - ... - A20 - A21
77 # client pulls A20, B1. Then tracks only B. Then pulls A.
79 test_expect_success
'setup' '
84 git config transfer.unpacklimit 0
89 while [ $cur -le 10 ]; do
90 add A$cur $(eval echo \$A$prev) &&
95 git update-ref refs/heads/A "$ATIP" &&
96 git update-ref refs/heads/B "$BTIP" &&
97 git symbolic-ref HEAD refs/heads/B
100 pull_to_client
1st
"refs/heads/B refs/heads/A" $
((11*3))
102 test_expect_success
'post 1st pull setup' '
106 while [ $cur -le 65 ]; do
107 add B$cur $(eval echo \$B$prev) &&
113 pull_to_client
2nd
"refs/heads/B" $
((64*3))
115 pull_to_client
3rd
"refs/heads/A" $
((1*3))
117 test_expect_success
'single branch clone' '
118 git clone --single-branch "file://$(pwd)/." singlebranch
121 test_expect_success
'single branch object count' '
122 GIT_DIR=singlebranch/.git git count-objects -v |
123 grep "^in-pack:" > count.singlebranch &&
124 echo "in-pack: 198" >expected &&
125 test_cmp expected count.singlebranch
128 test_expect_success
'single given branch clone' '
129 git clone --single-branch --branch A "file://$(pwd)/." branch-a &&
130 test_must_fail git --git-dir=branch-a/.git rev-parse origin/B
133 test_expect_success
'clone shallow depth 1' '
134 git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0 &&
135 test "$(git --git-dir=shallow0/.git rev-list --count HEAD)" = 1
138 test_expect_success
'clone shallow depth 1 with fsck' '
139 git config --global fetch.fsckobjects true &&
140 git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0fsck &&
141 test "$(git --git-dir=shallow0fsck/.git rev-list --count HEAD)" = 1 &&
142 git config --global --unset fetch.fsckobjects
145 test_expect_success
'clone shallow' '
146 git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow
149 test_expect_success
'clone shallow depth count' '
150 test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 2
153 test_expect_success
'clone shallow object count' '
158 grep "^in-pack: 12" count.shallow
161 test_expect_success
'clone shallow object count (part 2)' '
162 sed -e "/^in-pack:/d" -e "/^packs:/d" -e "/^size-pack:/d" \
163 -e "/: 0$/d" count.shallow > count_output &&
164 ! test -s count_output
167 test_expect_success
'fsck in shallow repo' '
174 test_expect_success
'simple fetch in shallow repo' '
181 test_expect_success
'no changes expected' '
185 ) > count.shallow.2 &&
186 cmp count.shallow count.shallow.2
189 test_expect_success
'fetch same depth in shallow repo' '
196 test_expect_success
'no changes expected' '
200 ) > count.shallow.3 &&
201 cmp count.shallow count.shallow.3
204 test_expect_success
'add two more' '
209 test_expect_success
'pull in shallow repo' '
216 test_expect_success
'clone shallow object count' '
221 grep "^count: 6" count.shallow
224 test_expect_success
'add two more (part 2)' '
229 test_expect_success
'deepening pull in shallow repo' '
232 git pull --depth 4 .. B
236 test_expect_success
'clone shallow object count' '
241 grep "^count: 12" count.shallow
244 test_expect_success
'deepening fetch in shallow repo' '
247 git fetch --depth 4 .. A:A
251 test_expect_success
'clone shallow object count' '
256 grep "^count: 18" count.shallow
259 test_expect_success
'pull in shallow repo with missing merge base' '
262 git fetch --depth 4 .. A &&
263 test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
267 test_expect_success
'additional simple shallow deepenings' '
270 git fetch --depth=8 &&
271 git fetch --depth=10 &&
276 test_expect_success
'clone shallow depth count' '
277 test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 11
280 test_expect_success
'clone shallow object count' '
286 grep "^count: 54" count.shallow
289 test_expect_success
'fetch --no-shallow on full repo' '
290 test_must_fail git fetch --noshallow
293 test_expect_success
'fetch --depth --no-shallow' '
296 test_must_fail git fetch --depth=1 --noshallow
300 test_expect_success
'turn shallow to complete repository' '
303 git fetch --unshallow &&
304 ! test -f .git/shallow &&
309 test_expect_success
'clone shallow without --no-single-branch' '
310 git clone --depth 1 "file://$(pwd)/." shallow2
313 test_expect_success
'clone shallow object count' '
317 ) > count.shallow2 &&
318 grep "^in-pack: 3" count.shallow2
321 test_expect_success
'clone shallow with --branch' '
322 git clone --depth 1 --branch A "file://$(pwd)/." shallow3
325 test_expect_success
'clone shallow object count' '
326 echo "in-pack: 3" > count3.expected &&
327 GIT_DIR=shallow3/.git git count-objects -v |
328 grep "^in-pack" > count3.actual &&
329 test_cmp count3.expected count3.actual
332 test_expect_success
'clone shallow with detached HEAD' '
333 git checkout HEAD^ &&
334 git clone --depth 1 "file://$(pwd)/." shallow5 &&
336 GIT_DIR=shallow5/.git git rev-parse HEAD >actual &&
337 git rev-parse HEAD^ >expected &&
338 test_cmp expected actual
341 test_expect_success
'shallow clone pulling tags' '
342 git tag -a -m A TAGA1 A &&
343 git tag -a -m B TAGB1 B &&
346 git clone --depth 1 "file://$(pwd)/." shallow6 &&
348 cat >taglist.expected <<\EOF &&
352 GIT_DIR=shallow6/.git git tag -l >taglist.actual &&
353 test_cmp taglist.expected taglist.actual &&
355 echo "in-pack: 4" > count6.expected &&
356 GIT_DIR=shallow6/.git git count-objects -v |
357 grep "^in-pack" > count6.actual &&
358 test_cmp count6.expected count6.actual
361 test_expect_success
'shallow cloning single tag' '
362 git clone --depth 1 --branch=TAGB1 "file://$(pwd)/." shallow7 &&
363 cat >taglist.expected <<\EOF &&
367 GIT_DIR=shallow7/.git git tag -l >taglist.actual &&
368 test_cmp taglist.expected taglist.actual &&
370 echo "in-pack: 4" > count7.expected &&
371 GIT_DIR=shallow7/.git git count-objects -v |
372 grep "^in-pack" > count7.actual &&
373 test_cmp count7.expected count7.actual
376 test_expect_success
'clone shallow with packed refs' '
377 git pack-refs --all &&
378 git clone --depth 1 --branch A "file://$(pwd)/." shallow8 &&
379 echo "in-pack: 4" > count8.expected &&
380 GIT_DIR=shallow8/.git git count-objects -v |
381 grep "^in-pack" > count8.actual &&
382 test_cmp count8.expected count8.actual
385 test_expect_success
'fetch in shallow repo unreachable shallow objects' '
387 git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog &&
388 git clone --depth 1 "file://$(pwd)/no-reflog" shallow9 &&
390 git tag -d TAGB1 TAGB2 &&
391 git update-ref refs/heads/B B~~ &&
392 git gc --prune=now &&
395 git fsck --no-dangling
398 test_expect_success
'fetch creating new shallow root' '
400 git clone "file://$(pwd)/." shallow10 &&
401 git commit --allow-empty -m empty &&
403 git fetch --depth=1 --progress 2>actual &&
404 # This should fetch only the empty commit, no tree or
406 test_i18ngrep "remote: Total 1" actual
410 test_expect_success
'setup tests for the --stdin parameter' '
415 for head in A B C D E F
419 cat >input <<-\EOF &&
431 sort <input >expect &&
439 test_expect_success
'fetch refs from cmdline' '
442 git fetch-pack --no-progress .. $(cat ../input)
444 cut -d " " -f 2 <output | sort >actual &&
445 test_cmp expect actual
448 test_expect_success
'fetch refs from stdin' '
451 git fetch-pack --stdin --no-progress .. <../input
453 cut -d " " -f 2 <output | sort >actual &&
454 test_cmp expect actual
457 test_expect_success
'fetch mixed refs from cmdline and stdin' '
460 tail -n +5 ../input |
461 git fetch-pack --stdin --no-progress .. $(head -n 4 ../input)
463 cut -d " " -f 2 <output | sort >actual &&
464 test_cmp expect actual
467 test_expect_success
'test duplicate refs from stdin' '
470 git fetch-pack --stdin --no-progress .. <../input.dup
472 cut -d " " -f 2 <output | sort >actual &&
473 test_cmp expect actual
476 test_expect_success
'set up tests of missing reference' '
477 cat >expect-error <<-\EOF
478 error: no such remote ref refs/heads/xyzzy
482 test_expect_success
'test lonely missing ref' '
485 test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
487 test_i18ncmp expect-error error-m
490 test_expect_success
'test missing ref after existing' '
493 test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
495 test_i18ncmp expect-error error-em
498 test_expect_success
'test missing ref before existing' '
501 test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
503 test_i18ncmp expect-error error-me
506 test_expect_success
'test --all, --depth, and explicit head' '
509 git fetch-pack --no-progress --all --depth=1 .. refs/heads/A
510 ) >out-adh 2>error-adh
513 test_expect_success
'test --all, --depth, and explicit tag' '
514 git tag OLDTAG refs/heads/B~5 &&
517 git fetch-pack --no-progress --all --depth=1 .. refs/tags/OLDTAG
518 ) >out-adt 2>error-adt
521 test_expect_success
'test --all with tag to non-tip' '
522 git commit --allow-empty -m non-tip &&
523 git commit --allow-empty -m tip &&
524 git tag -m "annotated" non-tip HEAD^ &&
527 git fetch-pack --all ..
531 test_expect_success
'test --all wrt tag to non-commits' '
532 # create tag-to-{blob,tree,commit,tag}, making sure all tagged objects
533 # are reachable only via created tag references.
534 blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
535 git tag -a -m "tag -> blob" tag-to-blob $blob &&
537 tree=$(printf "100644 blob $blob\tfile" | git mktree) &&
538 git tag -a -m "tag -> tree" tag-to-tree $tree &&
540 tree2=$(printf "100644 blob $blob\tfile2" | git mktree) &&
541 commit=$(git commit-tree -m "hello commit" $tree) &&
542 git tag -a -m "tag -> commit" tag-to-commit $commit &&
544 blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) &&
545 tag=$(git mktag <<-EOF
549 tagger author A U Thor <author@example.com> 0 +0000
554 git tag -a -m "tag -> tag" tag-to-tag $tag &&
556 # `fetch-pack --all` should succeed fetching all those objects.
561 git fetch-pack --all .. &&
562 git cat-file blob $blob >/dev/null &&
563 git cat-file tree $tree >/dev/null &&
564 git cat-file commit $commit >/dev/null &&
565 git cat-file tag $tag >/dev/null
569 test_expect_success
'shallow fetch with tags does not break the repository' '
580 git fetch --depth=2 ../.git master:branch &&
585 test_expect_success
'fetch-pack can fetch a raw sha1' '
591 git update-ref refs/hidden/one HEAD^ &&
592 git config transfer.hiderefs refs/hidden &&
593 git config uploadpack.allowtipsha1inwant true
595 git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
598 test_expect_success
'fetch-pack can fetch a raw sha1 that is advertised as a ref' '
599 rm -rf server client &&
601 test_commit -C server 1 &&
604 git -C client fetch-pack ../server \
605 $(git -C server rev-parse refs/heads/master)
608 test_expect_success
'fetch-pack can fetch a raw sha1 overlapping a named ref' '
609 rm -rf server client &&
611 test_commit -C server 1 &&
612 test_commit -C server 2 &&
615 git -C client fetch-pack ../server \
616 $(git -C server rev-parse refs/tags/1) refs/tags/1
619 test_expect_success
'fetch-pack cannot fetch a raw sha1 that is not advertised as a ref' '
623 test_commit -C server 5 &&
624 git -C server tag -d 5 &&
625 test_commit -C server 6 &&
628 test_must_fail git -C client fetch-pack ../server \
629 $(git -C server rev-parse refs/heads/master^) 2>err &&
630 test_i18ngrep "Server does not allow request for unadvertised object" err
634 cat >expected
<<-EOF &&
639 git fetch-pack
--diag-url "$1" |
grep -v hostandport
= >actual
&&
640 test_cmp expected actual
643 check_prot_host_port_path
() {
648 ehost
=$
(echo $3 |
tr -d "[]")
649 diagport
="Diag: port=$4"
654 ehost
=$
(echo $3$4 |
sed -e "s/22$/:22/" -e "s/NONE//")
665 grep -v "^$" exp
>expected
666 git fetch-pack
--diag-url "$1" >actual
&&
667 test_cmp expected actual
670 for r
in repo re
:po re
/po
672 # git or ssh with scheme
673 for p
in "ssh+git" "git+ssh" git
ssh
675 for h
in host user@
host user@
[::1] user@
::1
679 test_expect_success
"fetch-pack --diag-url $p://$h$c/$r" '
680 check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
682 # "/~" -> "~" conversion
683 test_expect_success
"fetch-pack --diag-url $p://$h$c/~$r" '
684 check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
688 for h
in host User@
host User@
[::1]
690 test_expect_success
"fetch-pack --diag-url $p://$h:22/$r" '
691 check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
698 test_expect_success
"fetch-pack --diag-url $p://$h/$r" '
699 check_prot_path $p://$h/$r $p "/$r"
701 # No "/~" -> "~" conversion for file
702 test_expect_success
"fetch-pack --diag-url $p://$h/~$r" '
703 check_prot_path $p://$h/~$r $p "/~$r"
706 # file without scheme
707 for h
in nohost nohost
:12 [::1] [::1]:23 [ [:aa
709 test_expect_success
"fetch-pack --diag-url ./$h:$r" '
710 check_prot_path ./$h:$r $p "./$h:$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 "./$p:$h/~$r"
721 test_expect_success
"fetch-pack --diag-url $h:$r" '
722 check_prot_host_port_path $h:$r $p "$h" NONE "$r"
724 # Do "/~" -> "~" conversion
725 test_expect_success
"fetch-pack --diag-url $h:/~$r" '
726 check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
731 test_expect_success MINGW
'fetch-pack --diag-url file://c:/repo' '
732 check_prot_path file://c:/repo file c:/repo
734 test_expect_success MINGW
'fetch-pack --diag-url c:repo' '
735 check_prot_path c:repo file c:repo
738 test_expect_success
'clone shallow since ...' '
739 test_create_repo shallow-since &&
742 GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
743 GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
744 GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
745 git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
746 git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
747 echo three >expected &&
748 test_cmp expected actual
752 test_expect_success
'fetch shallow since ...' '
753 git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
754 git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
755 cat >expected <<-\EOF &&
759 test_cmp expected actual
762 test_expect_success
'clone shallow since selects no commits' '
763 test_create_repo shallow-since-the-future &&
765 cd shallow-since-the-future &&
766 GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
767 GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
768 GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
769 test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
773 test_expect_success
'shallow clone exclude tag two' '
774 test_create_repo shallow-exclude &&
776 cd shallow-exclude &&
780 git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
781 git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
782 echo three >expected &&
783 test_cmp expected actual
787 test_expect_success
'fetch exclude tag one' '
788 git -C shallow12 fetch --shallow-exclude one origin &&
789 git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
790 test_write_lines three two >expected &&
791 test_cmp expected actual
794 test_expect_success
'fetching deepen' '
795 test_create_repo shallow-deepen &&
801 git clone --depth 1 "file://$(pwd)/." deepen &&
803 git -C deepen log --pretty=tformat:%s master >actual &&
804 echo three >expected &&
805 test_cmp expected actual &&
806 git -C deepen fetch --deepen=1 &&
807 git -C deepen log --pretty=tformat:%s origin/master >actual &&
808 cat >expected <<-\EOF &&
813 test_cmp expected actual
817 test_expect_success
'use ref advertisement to prune "have" lines sent' '
818 rm -rf server client &&
820 test_commit -C server both_have_1 &&
821 git -C server tag -d both_have_1 &&
822 test_commit -C server both_have_2 &&
824 git clone server client &&
825 test_commit -C server server_has &&
826 test_commit -C client client_has &&
828 # In both protocol v0 and v2, ensure that the parent of both_have_2 is
829 # not sent as a "have" line. The client should know that the server has
830 # both_have_2, so it only needs to inform the server that it has
831 # both_have_2, and the server can infer the rest.
834 cp -r client clientv0 &&
835 GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv0 \
836 fetch origin server_has both_have_2 &&
837 grep "have $(git -C client rev-parse client_has)" trace &&
838 grep "have $(git -C client rev-parse both_have_2)" trace &&
839 ! grep "have $(git -C client rev-parse both_have_2^)" trace &&
842 cp -r client clientv2 &&
843 GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv2 -c protocol.version=2 \
844 fetch origin server_has both_have_2 &&
845 grep "have $(git -C client rev-parse client_has)" trace &&
846 grep "have $(git -C client rev-parse both_have_2)" trace &&
847 ! grep "have $(git -C client rev-parse both_have_2^)" trace
850 test_expect_success
'filtering by size' '
851 rm -rf server client &&
852 test_create_repo server &&
853 test_commit -C server one &&
854 test_config -C server uploadpack.allowfilter 1 &&
856 test_create_repo client &&
857 git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
859 # Ensure that object is not inadvertently fetched
860 test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
863 test_expect_success
'filtering by size has no effect if support for it is not advertised' '
864 rm -rf server client &&
865 test_create_repo server &&
866 test_commit -C server one &&
868 test_create_repo client &&
869 git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
871 # Ensure that object is fetched
872 git -C client cat-file -e $(git hash-object server/one.t) &&
874 test_i18ngrep "filtering not recognized by server" err
877 fetch_filter_blob_limit_zero
() {
881 rm -rf "$SERVER" client
&&
882 test_create_repo
"$SERVER" &&
883 test_commit
-C "$SERVER" one
&&
884 test_config
-C "$SERVER" uploadpack.allowfilter
1 &&
886 git clone
"$URL" client
&&
887 test_config
-C client extensions.partialclone origin
&&
889 test_commit
-C "$SERVER" two
&&
891 git
-C client fetch
--filter=blob
:limit
=0 origin HEAD
:somewhere
&&
893 # Ensure that commit is fetched, but blob is not
894 test_config
-C client extensions.partialclone
"arbitrary string" &&
895 git
-C client cat-file
-e $
(git
-C "$SERVER" rev-parse two
) &&
896 test_must_fail git
-C client cat-file
-e $
(git hash-object
"$SERVER/two.t")
899 test_expect_success
'fetch with --filter=blob:limit=0' '
900 fetch_filter_blob_limit_zero server server
903 .
"$TEST_DIRECTORY"/lib-httpd.sh
906 test_expect_success
'fetch with --filter=blob:limit=0 and HTTP' '
907 fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"