2 # Copyright (c) 2006, Junio C Hamano.
4 test_description
='Per branch config variables affects "git fetch".
12 test_bundle_object_count
() {
13 git verify-pack
-v "$1" >verify.out
&&
14 test "$2" = $
(grep '^[0-9a-f]\{40\} ' verify.out |
wc -l)
17 convert_bundle_to_pack
() {
18 while read x
&& test -n "$x"
25 test_expect_success setup
'
26 echo >file original &&
28 git commit -a -m original'
30 test_expect_success
"clone and setup child repos" '
34 echo >file updated by one &&
35 git commit -a -m "updated by one"
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
47 git config branch.master.remote two &&
48 git config branch.master.merge refs/heads/one &&
49 mkdir -p .git/remotes &&
51 echo "URL: ../two/.git/"
52 echo "Pull: refs/heads/master:refs/heads/two"
53 echo "Pull: refs/heads/one:refs/heads/one"
60 test_expect_success
"fetch test" '
62 echo >file updated by origin &&
63 git commit -a -m "updated by origin" &&
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"
72 test_expect_success
"fetch test for-merge" '
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) &&
82 echo "$master_in_two not-for-merge"
84 cut -f -2 .git/FETCH_HEAD >actual &&
85 test_cmp expected actual'
87 test_expect_success
'fetch --prune on its own works as expected' '
91 git update-ref refs/remotes/origin/extrabranch master &&
93 git fetch --prune origin &&
94 test_must_fail git rev-parse origin/extrabranch
97 test_expect_success
'fetch --prune with a branch name keeps branches' '
99 git clone . prune-branch &&
101 git update-ref refs/remotes/origin/extrabranch master &&
103 git fetch --prune origin master &&
104 git rev-parse origin/extrabranch
107 test_expect_success
'fetch --prune with a namespace keeps other namespaces' '
109 git clone . prune-namespace &&
110 cd prune-namespace &&
112 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
113 git rev-parse origin/master
116 test_expect_success
'fetch --prune handles overlapping refspecs' '
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/* &&
123 git fetch --prune origin &&
124 git rev-parse origin/master &&
125 git rev-parse origin/pr/42 &&
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/* &&
131 git fetch --prune origin &&
132 git rev-parse origin/master &&
133 git rev-parse origin/pr/42
136 test_expect_success
'fetch --prune --tags prunes branches but not tags' '
138 git clone . 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 &&
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
151 test_expect_success
'fetch --prune --tags with branch does not prune other things' '
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 &&
158 git fetch --prune --tags origin master &&
159 git rev-parse origin/extrabranch &&
160 git rev-parse sometag
163 test_expect_success
'fetch --prune --tags with refspec prunes based on refspec' '
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 &&
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
177 test_expect_success
'fetch tags when there is no tags' '
189 test_expect_success
'fetch following tags' '
192 git tag -a -m 'annotated
' anno HEAD &&
193 git tag light HEAD &&
199 git fetch .. :track &&
200 git show-ref --verify refs/tags/anno &&
201 git show-ref --verify refs/tags/light
205 test_expect_success
'fetch uses remote ref names to describe new refs' '
207 git init 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/*" &&
215 git tag -a -m "Descriptive tag" descriptive-tag &&
216 git branch descriptive-branch &&
217 git checkout descriptive-branch &&
218 echo "Nuts" >crazy &&
220 git commit -a -m "descriptive commit" &&
221 git update-ref refs/others/crazy HEAD &&
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
232 test_expect_success
'fetch must not resolve short tag name' '
240 test_must_fail git fetch .. anno:five
244 test_expect_success
'fetch can now resolve short remote name' '
247 git update-ref refs/remotes/six/HEAD HEAD &&
256 test_expect_success
'create bundle 1' '
258 echo >file updated again by origin &&
259 git commit -a -m "tip" &&
260 git bundle create bundle1 master^..master
263 test_expect_success
'header of bundle looks right' '
264 head -n 1 "$D"/bundle1 | grep "^#" &&
265 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
266 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
267 head -n 4 "$D"/bundle1 | grep "^$"
270 test_expect_success
'create bundle 2' '
272 git bundle create bundle2 master~2..master
275 test_expect_success
'unbundle 1' '
277 git checkout -b some-branch &&
278 test_must_fail git fetch "$D/bundle1" master:master
282 test_expect_success
'bundle 1 has only 3 files ' '
284 convert_bundle_to_pack <bundle1 >bundle.pack &&
285 git index-pack bundle.pack &&
286 test_bundle_object_count bundle.pack 3
289 test_expect_success
'unbundle 2' '
291 git fetch ../bundle2 master:master &&
292 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
295 test_expect_success
'bundle does not prerequisite objects' '
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
306 test_expect_success
'bundle should be able to create a full history' '
309 git tag -a -m '1.0' v1.0 master &&
310 git bundle create bundle4 v1.0
314 test_expect_success
'fetch with a non-applying branch.<name>.merge' '
315 git config branch.master.remote yeti &&
316 git config branch.master.merge refs/heads/bigfoot &&
317 git config remote.blub.url one &&
318 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
322 # URL supplied to fetch does not match the url of the configured branch's remote
323 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
324 one_head=$(cd one && git rev-parse HEAD) &&
325 this_head=$(git rev-parse HEAD) &&
326 git update-ref -d FETCH_HEAD &&
328 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
329 test $this_head = "$(git rev-parse --verify HEAD)"
332 # URL supplied to fetch matches the url of the configured branch's remote and
333 # the merge spec matches the branch the remote HEAD points to
334 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
335 one_ref=$(cd one && git symbolic-ref HEAD) &&
336 git config branch.master.remote blub &&
337 git config branch.master.merge "$one_ref" &&
338 git update-ref -d FETCH_HEAD &&
340 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
341 test $this_head = "$(git rev-parse --verify HEAD)"
344 # URL supplied to fetch matches the url of the configured branch's remote, but
345 # the merge spec does not match the branch the remote HEAD points to
346 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
347 git config branch.master.merge "${one_ref}_not" &&
348 git update-ref -d FETCH_HEAD &&
350 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
351 test $this_head = "$(git rev-parse --verify HEAD)"
354 # the strange name is: a\!'b
355 test_expect_success
'quoting of a strangely named repo' '
356 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
357 grep "fatal: '\''a\\\\!'\''b'\''" result
360 test_expect_success
'bundle should record HEAD correctly' '
363 git bundle create bundle5 HEAD master &&
364 git bundle list-heads bundle5 >actual &&
365 for h in HEAD refs/heads/master
367 echo "$(git rev-parse --verify $h) $h"
369 test_cmp expect actual
373 test_expect_success
'mark initial state of origin/master' '
376 git tag base-origin-master refs/remotes/origin/master
380 test_expect_success
'explicit fetch should update tracking' '
383 git branch -f side &&
386 git update-ref refs/remotes/origin/master base-origin-master &&
387 o=$(git rev-parse --verify refs/remotes/origin/master) &&
388 git fetch origin master &&
389 n=$(git rev-parse --verify refs/remotes/origin/master) &&
391 test_must_fail git rev-parse --verify refs/remotes/origin/side
395 test_expect_success
'explicit pull should update tracking' '
398 git branch -f side &&
401 git update-ref refs/remotes/origin/master base-origin-master &&
402 o=$(git rev-parse --verify refs/remotes/origin/master) &&
403 git pull origin master &&
404 n=$(git rev-parse --verify refs/remotes/origin/master) &&
406 test_must_fail git rev-parse --verify refs/remotes/origin/side
410 test_expect_success
'explicit --refmap is allowed only with command-line refspec' '
414 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
418 test_expect_success
'explicit --refmap option overrides remote.*.fetch' '
420 git branch -f side &&
423 git update-ref refs/remotes/origin/master base-origin-master &&
424 o=$(git rev-parse --verify refs/remotes/origin/master) &&
425 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
426 n=$(git rev-parse --verify refs/remotes/origin/master) &&
428 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
429 git rev-parse --verify refs/remotes/other/master
433 test_expect_success
'explicitly empty --refmap option disables remote.*.fetch' '
435 git branch -f side &&
438 git update-ref refs/remotes/origin/master base-origin-master &&
439 o=$(git rev-parse --verify refs/remotes/origin/master) &&
440 git fetch --refmap="" origin master &&
441 n=$(git rev-parse --verify refs/remotes/origin/master) &&
443 test_must_fail git rev-parse --verify refs/remotes/origin/side
447 test_expect_success
'configured fetch updates tracking' '
450 git branch -f side &&
453 git update-ref refs/remotes/origin/master base-origin-master &&
454 o=$(git rev-parse --verify refs/remotes/origin/master) &&
456 n=$(git rev-parse --verify refs/remotes/origin/master) &&
458 git rev-parse --verify refs/remotes/origin/side
462 test_expect_success
'non-matching refspecs do not confuse tracking update' '
464 git update-ref refs/odd/location HEAD &&
467 git update-ref refs/remotes/origin/master base-origin-master &&
468 git config --add remote.origin.fetch \
469 refs/odd/location:refs/remotes/origin/odd &&
470 o=$(git rev-parse --verify refs/remotes/origin/master) &&
471 git fetch origin master &&
472 n=$(git rev-parse --verify refs/remotes/origin/master) &&
474 test_must_fail git rev-parse --verify refs/remotes/origin/odd
478 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
481 test_must_fail git push seven no:no
485 test_expect_success
'auto tag following fetches minimum' '
488 git clone .git follow &&
489 git checkout HEAD^0 &&
491 for i in 1 2 3 4 5 6 7
494 git commit -m $i -a &&
495 git tag -a -m $i excess-$i || exit 1
498 git checkout master &&
505 test_expect_success
'refuse to fetch into the current branch' '
507 test_must_fail git fetch . side:master
511 test_expect_success
'fetch into the current branch with --update-head-ok' '
513 git fetch --update-head-ok . side:master
517 test_expect_success
'fetch --dry-run' '
519 rm -f .git/FETCH_HEAD &&
520 git fetch --dry-run . &&
521 ! test -f .git/FETCH_HEAD
524 test_expect_success
"should be able to fetch with duplicate refspecs" '
529 git config branch.master.remote three &&
530 git config remote.three.url ../three/.git &&
531 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
532 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
537 test_expect_success
'LHS of refspec follows ref disambiguation rules' '
538 mkdir lhs-ambiguous &&
542 test_commit -C server unwanted &&
543 test_commit -C server wanted &&
547 # Check a name coming after "refs" alphabetically ...
548 git -C server update-ref refs/heads/s wanted &&
549 git -C server update-ref refs/heads/refs/heads/s unwanted &&
550 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
551 git -C server rev-parse wanted >expect &&
552 git -C client rev-parse checkthis >actual &&
553 test_cmp expect actual &&
555 # ... and one before.
556 git -C server update-ref refs/heads/q wanted &&
557 git -C server update-ref refs/heads/refs/heads/q unwanted &&
558 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
559 git -C server rev-parse wanted >expect &&
560 git -C client rev-parse checkthis >actual &&
561 test_cmp expect actual &&
563 # Tags are preferred over branches like refs/{heads,tags}/*
564 git -C server update-ref refs/tags/t wanted &&
565 git -C server update-ref refs/heads/t unwanted &&
566 git -C client fetch ../server +t:refs/heads/checkthis &&
567 git -C server rev-parse wanted >expect &&
568 git -C client rev-parse checkthis >actual
572 test_expect_success
'fetch.writeCommitGraph' '
573 git clone three write &&
580 git -c fetch.writeCommitGraph fetch origin &&
581 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
585 test_expect_success
'fetch.writeCommitGraph with submodules' '
586 git clone dups super &&
589 git submodule add "file://$TRASH_DIRECTORY/three" &&
590 git commit -m "add submodule"
592 git clone "super" super-clone &&
595 rm -rf .git/objects/info &&
596 git -c fetch.writeCommitGraph=true fetch origin &&
597 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
601 # configured prune tests
603 set_config_tristate
() {
611 key
=$
(echo $1 |
sed -e 's/^remote\.origin/fetch/')
612 git_fetch_c
="$git_fetch_c -c $key=$2"
617 test_configured_prune
() {
618 test_configured_prune_type
"$@" "name"
619 test_configured_prune_type
"$@" "link"
622 test_configured_prune_type
() {
624 remote_origin_prune
=$2
626 remote_origin_prune_tags
=$4
632 if test -z "$cmdline_setup"
634 test_expect_success
'setup cmdline_setup variable for subsequent test' '
635 remote_url="file://$(git -C one config remote.origin.url)" &&
636 remote_fetch="$(git -C one config remote.origin.fetch)" &&
637 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
641 if test "$mode" = 'link'
645 if test "$cmdline" = ""
647 new_cmdline
=$cmdline_setup
649 new_cmdline
=$
(printf "%s" "$cmdline" | perl
-pe 's[origin(?!/)]["'"$remote_url"'"]g')
652 if test "$fetch_prune_tags" = 'true' ||
653 test "$remote_origin_prune_tags" = 'true'
655 if ! printf '%s' "$cmdline\n" |
grep -q refs
/remotes
/origin
/
657 new_cmdline
="$new_cmdline refs/tags/*:refs/tags/*"
661 cmdline
="$new_cmdline"
664 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" '
665 # make sure a newbranch is there in . and also in one
666 git branch -f newbranch &&
670 test_unconfig fetch.prune &&
671 test_unconfig fetch.pruneTags &&
672 test_unconfig remote.origin.prune &&
673 test_unconfig remote.origin.pruneTags &&
674 git fetch '"$cmdline_setup"' &&
675 git rev-parse --verify refs/remotes/origin/newbranch &&
676 git rev-parse --verify refs/tags/newtag
680 git branch -d newbranch &&
687 set_config_tristate fetch.prune $fetch_prune &&
688 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
689 set_config_tristate remote.origin.prune $remote_origin_prune &&
690 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
692 if test "$mode" != "link"
696 git$git_fetch_c fetch '"$cmdline"' &&
697 case "$expected_branch" in
699 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
702 git rev-parse --verify refs/remotes/origin/newbranch
705 case "$expected_tag" in
707 test_must_fail git rev-parse --verify refs/tags/newtag
710 git rev-parse --verify refs/tags/newtag
717 # $1 config: fetch.prune
718 # $2 config: remote.<name>.prune
719 # $3 config: fetch.pruneTags
720 # $4 config: remote.<name>.pruneTags
721 # $5 expect: branch to be pruned?
722 # $6 expect: tag to be pruned?
723 # $7 git-fetch $cmdline:
725 # $1 $2 $3 $4 $5 $6 $7
726 test_configured_prune
unset unset unset unset kept kept
""
727 test_configured_prune
unset unset unset unset kept kept
"--no-prune"
728 test_configured_prune
unset unset unset unset pruned kept
"--prune"
729 test_configured_prune
unset unset unset unset kept pruned \
730 "--prune origin refs/tags/*:refs/tags/*"
731 test_configured_prune
unset unset unset unset pruned pruned \
732 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
734 test_configured_prune false
unset unset unset kept kept
""
735 test_configured_prune false
unset unset unset kept kept
"--no-prune"
736 test_configured_prune false
unset unset unset pruned kept
"--prune"
738 test_configured_prune true
unset unset unset pruned kept
""
739 test_configured_prune true
unset unset unset pruned kept
"--prune"
740 test_configured_prune true
unset unset unset kept kept
"--no-prune"
742 test_configured_prune
unset false
unset unset kept kept
""
743 test_configured_prune
unset false
unset unset kept kept
"--no-prune"
744 test_configured_prune
unset false
unset unset pruned kept
"--prune"
746 test_configured_prune false false
unset unset kept kept
""
747 test_configured_prune false false
unset unset kept kept
"--no-prune"
748 test_configured_prune false false
unset unset pruned kept
"--prune"
749 test_configured_prune false false
unset unset kept pruned \
750 "--prune origin refs/tags/*:refs/tags/*"
751 test_configured_prune false false
unset unset pruned pruned \
752 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
754 test_configured_prune true false
unset unset kept kept
""
755 test_configured_prune true false
unset unset pruned kept
"--prune"
756 test_configured_prune true false
unset unset kept kept
"--no-prune"
758 test_configured_prune
unset true
unset unset pruned kept
""
759 test_configured_prune
unset true
unset unset kept kept
"--no-prune"
760 test_configured_prune
unset true
unset unset pruned kept
"--prune"
762 test_configured_prune false true
unset unset pruned kept
""
763 test_configured_prune false true
unset unset kept kept
"--no-prune"
764 test_configured_prune false true
unset unset pruned kept
"--prune"
766 test_configured_prune true true
unset unset pruned kept
""
767 test_configured_prune true true
unset unset pruned kept
"--prune"
768 test_configured_prune true true
unset unset kept kept
"--no-prune"
769 test_configured_prune true true
unset unset kept pruned \
770 "--prune origin refs/tags/*:refs/tags/*"
771 test_configured_prune true true
unset unset pruned pruned \
772 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
774 # --prune-tags on its own does nothing, needs --prune as well, same
775 # for for fetch.pruneTags without fetch.prune
776 test_configured_prune
unset unset unset unset kept kept
"--prune-tags"
777 test_configured_prune
unset unset true
unset kept kept
""
778 test_configured_prune
unset unset unset true kept kept
""
780 # These will prune the tags
781 test_configured_prune
unset unset unset unset pruned pruned
"--prune --prune-tags"
782 test_configured_prune true
unset true
unset pruned pruned
""
783 test_configured_prune
unset true
unset true pruned pruned
""
785 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
786 # remote.<name>.prune overrides fetch.prune if set.
787 test_configured_prune true
unset true
unset pruned pruned
""
788 test_configured_prune false true false true pruned pruned
""
789 test_configured_prune true false true false kept kept
""
791 # When --prune-tags is supplied it's ignored if an explicit refspec is
792 # given, same for the configuration options.
793 test_configured_prune
unset unset unset unset pruned kept \
794 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
795 test_configured_prune
unset unset true
unset pruned kept \
796 "--prune origin +refs/heads/*:refs/remotes/origin/*"
797 test_configured_prune
unset unset unset true pruned kept \
798 "--prune origin +refs/heads/*:refs/remotes/origin/*"
800 # Pruning that also takes place if a file:// url replaces a named
801 # remote. However, because there's no implicit
802 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
803 # command-line negates --prune-tags, the branches will not be pruned.
804 test_configured_prune_type
unset unset unset unset kept kept
"origin --prune-tags" "name"
805 test_configured_prune_type
unset unset unset unset kept kept
"origin --prune-tags" "link"
806 test_configured_prune_type
unset unset unset unset pruned pruned
"origin --prune --prune-tags" "name"
807 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "link"
808 test_configured_prune_type
unset unset unset unset pruned pruned
"--prune --prune-tags origin" "name"
809 test_configured_prune_type
unset unset unset unset kept pruned
"--prune --prune-tags origin" "link"
810 test_configured_prune_type
unset unset true
unset pruned pruned
"--prune origin" "name"
811 test_configured_prune_type
unset unset true
unset kept pruned
"--prune origin" "link"
812 test_configured_prune_type
unset unset unset true pruned pruned
"--prune origin" "name"
813 test_configured_prune_type
unset unset unset true kept pruned
"--prune origin" "link"
814 test_configured_prune_type true
unset true
unset pruned pruned
"origin" "name"
815 test_configured_prune_type true
unset true
unset kept pruned
"origin" "link"
816 test_configured_prune_type
unset true true
unset pruned pruned
"origin" "name"
817 test_configured_prune_type
unset true true
unset kept pruned
"origin" "link"
818 test_configured_prune_type
unset true
unset true pruned pruned
"origin" "name"
819 test_configured_prune_type
unset true
unset true kept pruned
"origin" "link"
821 # When all remote.origin.fetch settings are deleted a --prune
822 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
823 # tags, but not tracking branches, will be deleted.
824 test_expect_success
'remove remote.origin.fetch "one"' '
827 git config --unset-all remote.origin.fetch
830 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "name"
831 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "link"
833 test_expect_success
'all boundary commits are excluded' '
835 test_commit oneside &&
836 git checkout HEAD^ &&
837 test_commit otherside &&
838 git checkout master &&
840 git merge otherside &&
841 ad=$(git log --no-walk --format=%ad HEAD) &&
842 git bundle create twoside-boundary.bdl master --since="$ad" &&
843 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
844 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
845 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
848 test_expect_success
'fetch --prune prints the remotes url' '
849 git branch goodbye &&
850 git clone . only-prunes &&
851 git branch -D goodbye &&
854 git fetch --prune origin 2>&1 | head -n1 >../actual
856 echo "From ${D}/." >expect &&
857 test_i18ncmp expect actual
860 test_expect_success
'branchname D/F conflict resolved by --prune' '
861 git branch dir/file &&
862 git clone . prune-df-conflict &&
863 git branch -D dir/file &&
866 cd prune-df-conflict &&
868 git rev-parse origin/dir >../actual
870 git rev-parse dir >expect &&
871 test_cmp expect actual
874 test_expect_success
'fetching a one-level ref works' '
876 git reset --hard HEAD^ &&
877 git update-ref refs/foo extra &&
878 git init one-level &&
881 git fetch .. HEAD refs/foo
885 test_expect_success
'fetching with auto-gc does not lock up' '
886 write_script askyesno <<-\EOF &&
890 git clone "file://$D" auto-gc &&
894 git config fetch.unpackLimit 1 &&
895 git config gc.autoPackLimit 1 &&
896 git config gc.autoDetach false &&
897 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
898 test_i18ngrep "Auto packing the repository" fetch.out &&
899 ! grep "Should I try again" fetch.out
903 test_expect_success C_LOCALE_OUTPUT
'fetch aligned output' '
904 git clone . full-output &&
905 test_commit looooooooooooong-tag &&
908 git -c fetch.output=full fetch origin >actual 2>&1 &&
909 grep -e "->" actual | cut -c 22- >../actual
911 cat >expect <<-\EOF &&
912 master -> origin/master
913 looooooooooooong-tag -> looooooooooooong-tag
915 test_cmp expect actual
918 test_expect_success C_LOCALE_OUTPUT
'fetch compact output' '
919 git clone . compact &&
920 test_commit extraaa &&
923 git -c fetch.output=compact fetch origin >actual 2>&1 &&
924 grep -e "->" actual | cut -c 22- >../actual
926 cat >expect <<-\EOF &&
930 test_cmp expect actual
933 test_expect_success
'--no-show-forced-updates' '
934 mkdir forced-updates &&
941 git clone forced-updates forced-update-clone &&
942 git clone forced-updates no-forced-update-clone &&
943 git -C forced-updates reset --hard HEAD~1 &&
945 cd forced-update-clone &&
946 git fetch --show-forced-updates origin 2>output &&
947 test_i18ngrep "(forced update)" output
950 cd no-forced-update-clone &&
951 git fetch --no-show-forced-updates origin 2>output &&
952 test_i18ngrep ! "(forced update)" output
956 setup_negotiation_tip
() {
961 rm -rf "$SERVER" client trace
&&
962 git init
"$SERVER" &&
963 test_commit
-C "$SERVER" alpha_1
&&
964 test_commit
-C "$SERVER" alpha_2
&&
965 git
-C "$SERVER" checkout
--orphan beta
&&
966 test_commit
-C "$SERVER" beta_1
&&
967 test_commit
-C "$SERVER" beta_2
&&
969 git clone
"$URL" client
&&
971 if test "$USE_PROTOCOL_V2" -eq 1
973 git
-C "$SERVER" config protocol.version
2 &&
974 git
-C client config protocol.version
2
977 test_commit
-C "$SERVER" beta_s
&&
978 git
-C "$SERVER" checkout master
&&
979 test_commit
-C "$SERVER" alpha_s
&&
980 git
-C "$SERVER" tag
-d alpha_1 alpha_2 beta_1 beta_2
983 check_negotiation_tip
() {
984 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
985 ALPHA_1
=$
(git
-C client rev-parse alpha_1
) &&
986 grep "fetch> have $ALPHA_1" trace
&&
987 BETA_1
=$
(git
-C client rev-parse beta_1
) &&
988 grep "fetch> have $BETA_1" trace
&&
989 ALPHA_2
=$
(git
-C client rev-parse alpha_2
) &&
990 ! grep "fetch> have $ALPHA_2" trace
&&
991 BETA_2
=$
(git
-C client rev-parse beta_2
) &&
992 ! grep "fetch> have $BETA_2" trace
995 test_expect_success
'--negotiation-tip limits "have" lines sent' '
996 setup_negotiation_tip server server 0 &&
997 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
998 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
999 origin alpha_s beta_s &&
1000 check_negotiation_tip
1003 test_expect_success
'--negotiation-tip understands globs' '
1004 setup_negotiation_tip server server 0 &&
1005 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1006 --negotiation-tip=*_1 \
1007 origin alpha_s beta_s &&
1008 check_negotiation_tip
1011 test_expect_success
'--negotiation-tip understands abbreviated SHA-1' '
1012 setup_negotiation_tip server server 0 &&
1013 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1014 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1015 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1016 origin alpha_s beta_s &&
1017 check_negotiation_tip
1020 .
"$TEST_DIRECTORY"/lib-httpd.sh
1023 test_expect_success
'--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1024 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1025 "$HTTPD_URL/smart/server" 1 &&
1026 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1027 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1028 origin alpha_s beta_s &&
1029 check_negotiation_tip
1032 # DO NOT add non-httpd-specific tests here, because the last part of this
1033 # test script is only executed when httpd is available and enabled.