2 # Copyright (c) 2006, Junio C Hamano.
4 test_description
='Per branch config variables affects "git fetch".
9 .
"$TEST_DIRECTORY"/lib-bundle.sh
11 if ! test_have_prereq PERL_TEST_HELPERS
13 skip_all
='skipping fetch tests; Perl not available'
19 test_expect_success setup
'
20 echo >file original &&
22 git commit -a -m original &&
26 test_expect_success
"clone and setup child repos" '
30 echo >file updated by one &&
31 git commit -a -m "updated by one"
36 git config branch.main.remote one &&
37 git config remote.one.url ../one/.git/ &&
38 git config remote.one.fetch refs/heads/main:refs/heads/one
43 git config set remote.two.url ../two/.git/ &&
44 git config set remote.two.fetch refs/heads/main:refs/heads/two &&
45 git config set --append remote.two.fetch refs/heads/one:refs/heads/one &&
46 git config set branch.main.remote two &&
47 git config set branch.main.merge refs/heads/one
53 test_expect_success
"fetch test" '
55 echo >file updated by origin &&
56 git commit -a -m "updated by origin" &&
59 git rev-parse --verify refs/heads/one &&
60 mine=$(git rev-parse refs/heads/one) &&
61 his=$(cd ../one && git rev-parse refs/heads/main) &&
62 test "z$mine" = "z$his"
65 test_expect_success
"fetch test for-merge" '
69 git rev-parse --verify refs/heads/two &&
70 git rev-parse --verify refs/heads/one &&
71 main_in_two=$(cd ../two && git rev-parse main) &&
72 one_in_two=$(cd ../two && git rev-parse one) &&
74 echo "$one_in_two " &&
75 echo "$main_in_two not-for-merge"
77 cut -f -2 .git/FETCH_HEAD >actual &&
78 test_cmp expected actual'
80 test_expect_success
"fetch test remote HEAD" '
84 git rev-parse --verify refs/remotes/origin/HEAD &&
85 git rev-parse --verify refs/remotes/origin/main &&
86 head=$(git rev-parse refs/remotes/origin/HEAD) &&
87 branch=$(git rev-parse refs/remotes/origin/main) &&
88 test "z$head" = "z$branch"'
90 test_expect_success
"fetch test remote HEAD in bare repository" '
91 test_when_finished rm -rf barerepo &&
94 git init --bare barerepo &&
96 git remote add upstream ../two &&
98 git rev-parse --verify refs/remotes/upstream/HEAD &&
99 git rev-parse --verify refs/remotes/upstream/main &&
100 head=$(git rev-parse refs/remotes/upstream/HEAD) &&
101 branch=$(git rev-parse refs/remotes/upstream/main) &&
102 test "z$head" = "z$branch"
107 test_expect_success
"fetch test remote HEAD change" '
110 git switch -c other &&
111 git push -u origin other &&
112 git rev-parse --verify refs/remotes/origin/HEAD &&
113 git rev-parse --verify refs/remotes/origin/main &&
114 git rev-parse --verify refs/remotes/origin/other &&
115 git remote set-head origin other &&
117 head=$(git rev-parse refs/remotes/origin/HEAD) &&
118 branch=$(git rev-parse refs/remotes/origin/other) &&
119 test "z$head" = "z$branch"'
121 test_expect_success
"fetch test followRemoteHEAD never" '
122 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
126 git update-ref --no-deref -d refs/remotes/origin/HEAD &&
127 git config set remote.origin.followRemoteHEAD "never" &&
128 GIT_TRACE_PACKET=$PWD/trace.out git fetch &&
129 # Confirm that we do not even ask for HEAD when we are
130 # not going to act on it.
131 test_grep ! "ref-prefix HEAD" trace.out &&
132 test_must_fail git rev-parse --verify refs/remotes/origin/HEAD
136 test_expect_success
"fetch test followRemoteHEAD warn no change" '
137 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
141 git rev-parse --verify refs/remotes/origin/other &&
142 git remote set-head origin other &&
143 git rev-parse --verify refs/remotes/origin/HEAD &&
144 git rev-parse --verify refs/remotes/origin/main &&
145 git config set remote.origin.followRemoteHEAD "warn" &&
147 echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
148 "but we have ${SQ}other${SQ} locally." >expect &&
149 test_cmp expect output &&
150 head=$(git rev-parse refs/remotes/origin/HEAD) &&
151 branch=$(git rev-parse refs/remotes/origin/other) &&
152 test "z$head" = "z$branch"
156 test_expect_success
"fetch test followRemoteHEAD warn create" '
157 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
161 git update-ref --no-deref -d refs/remotes/origin/HEAD &&
162 git config set remote.origin.followRemoteHEAD "warn" &&
163 git rev-parse --verify refs/remotes/origin/main &&
164 output=$(git fetch) &&
165 test "z" = "z$output" &&
166 head=$(git rev-parse refs/remotes/origin/HEAD) &&
167 branch=$(git rev-parse refs/remotes/origin/main) &&
168 test "z$head" = "z$branch"
172 test_expect_success
"fetch test followRemoteHEAD warn detached" '
173 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
177 git update-ref --no-deref -d refs/remotes/origin/HEAD &&
178 git update-ref refs/remotes/origin/HEAD HEAD &&
179 HEAD=$(git log --pretty="%H") &&
180 git config set remote.origin.followRemoteHEAD "warn" &&
182 echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
183 "but we have a detached HEAD pointing to" \
184 "${SQ}${HEAD}${SQ} locally." >expect &&
185 test_cmp expect output
189 test_expect_success
"fetch test followRemoteHEAD warn quiet" '
190 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
194 git rev-parse --verify refs/remotes/origin/other &&
195 git remote set-head origin other &&
196 git rev-parse --verify refs/remotes/origin/HEAD &&
197 git rev-parse --verify refs/remotes/origin/main &&
198 git config set remote.origin.followRemoteHEAD "warn" &&
199 output=$(git fetch --quiet) &&
200 test "z" = "z$output" &&
201 head=$(git rev-parse refs/remotes/origin/HEAD) &&
202 branch=$(git rev-parse refs/remotes/origin/other) &&
203 test "z$head" = "z$branch"
207 test_expect_success
"fetch test followRemoteHEAD warn-if-not-branch branch is same" '
208 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
212 git rev-parse --verify refs/remotes/origin/other &&
213 git remote set-head origin other &&
214 git rev-parse --verify refs/remotes/origin/HEAD &&
215 git rev-parse --verify refs/remotes/origin/main &&
216 git config set remote.origin.followRemoteHEAD "warn-if-not-main" &&
217 actual=$(git fetch) &&
218 test "z" = "z$actual" &&
219 head=$(git rev-parse refs/remotes/origin/HEAD) &&
220 branch=$(git rev-parse refs/remotes/origin/other) &&
221 test "z$head" = "z$branch"
225 test_expect_success
"fetch test followRemoteHEAD warn-if-not-branch branch is different" '
226 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
230 git rev-parse --verify refs/remotes/origin/other &&
231 git remote set-head origin other &&
232 git rev-parse --verify refs/remotes/origin/HEAD &&
233 git rev-parse --verify refs/remotes/origin/main &&
234 git config set remote.origin.followRemoteHEAD "warn-if-not-some/different-branch" &&
236 echo "${SQ}HEAD${SQ} at ${SQ}origin${SQ} is ${SQ}main${SQ}," \
237 "but we have ${SQ}other${SQ} locally." >expect &&
238 test_cmp expect actual &&
239 head=$(git rev-parse refs/remotes/origin/HEAD) &&
240 branch=$(git rev-parse refs/remotes/origin/other) &&
241 test "z$head" = "z$branch"
245 test_expect_success
"fetch test followRemoteHEAD always" '
246 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
250 git rev-parse --verify refs/remotes/origin/other &&
251 git remote set-head origin other &&
252 git rev-parse --verify refs/remotes/origin/HEAD &&
253 git rev-parse --verify refs/remotes/origin/main &&
254 git config set remote.origin.followRemoteHEAD "always" &&
256 head=$(git rev-parse refs/remotes/origin/HEAD) &&
257 branch=$(git rev-parse refs/remotes/origin/main) &&
258 test "z$head" = "z$branch"
262 test_expect_success
'followRemoteHEAD does not kick in with refspecs' '
263 test_when_finished "git config unset remote.origin.followRemoteHEAD" &&
267 git remote set-head origin other &&
268 git config set remote.origin.followRemoteHEAD always &&
269 git fetch origin refs/heads/main:refs/remotes/origin/main &&
270 echo refs/remotes/origin/other >expect &&
271 git symbolic-ref refs/remotes/origin/HEAD >actual &&
272 test_cmp expect actual
276 test_expect_success
'fetch --prune on its own works as expected' '
280 git update-ref refs/remotes/origin/extrabranch main &&
282 git fetch --prune origin &&
283 test_must_fail git rev-parse origin/extrabranch
286 test_expect_success
'fetch --prune with a branch name keeps branches' '
288 git clone . prune-branch &&
290 git update-ref refs/remotes/origin/extrabranch main &&
292 git fetch --prune origin main &&
293 git rev-parse origin/extrabranch
296 test_expect_success
'fetch --prune with a namespace keeps other namespaces' '
298 git clone . prune-namespace &&
299 cd prune-namespace &&
301 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
302 git rev-parse origin/main
305 test_expect_success
'fetch --prune handles overlapping refspecs' '
307 git update-ref refs/pull/42/head main &&
308 git clone . prune-overlapping &&
309 cd prune-overlapping &&
310 git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
312 git fetch --prune origin &&
313 git rev-parse origin/main &&
314 git rev-parse origin/pr/42 &&
316 git config --unset-all remote.origin.fetch &&
317 git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
318 git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
320 git fetch --prune origin &&
321 git rev-parse origin/main &&
322 git rev-parse origin/pr/42
325 test_expect_success
'fetch --prune --tags prunes branches but not tags' '
327 git clone . prune-tags &&
329 git tag sometag main &&
330 # Create what looks like a remote-tracking branch from an earlier
331 # fetch that has since been deleted from the remote:
332 git update-ref refs/remotes/origin/fake-remote main &&
334 git fetch --prune --tags origin &&
335 git rev-parse origin/main &&
336 test_must_fail git rev-parse origin/fake-remote &&
337 git rev-parse sometag
340 test_expect_success
'fetch --prune --tags with branch does not prune other things' '
342 git clone . prune-tags-branch &&
343 cd prune-tags-branch &&
344 git tag sometag main &&
345 git update-ref refs/remotes/origin/extrabranch main &&
347 git fetch --prune --tags origin main &&
348 git rev-parse origin/extrabranch &&
349 git rev-parse sometag
352 test_expect_success
'fetch --prune --tags with refspec prunes based on refspec' '
354 git clone . prune-tags-refspec &&
355 cd prune-tags-refspec &&
356 git tag sometag main &&
357 git update-ref refs/remotes/origin/foo/otherbranch main &&
358 git update-ref refs/remotes/origin/extrabranch main &&
360 git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
361 test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
362 git rev-parse origin/extrabranch &&
363 git rev-parse sometag
366 test_expect_success
'fetch --tags gets tags even without a configured remote' '
367 REMOTE="$(pwd)/test_tag_1" &&
368 git init test_tag_1 &&
373 git init test_tag_2 &&
376 git fetch --tags "file://$REMOTE" &&
377 echo "foo" >expect &&
379 test_cmp expect actual
383 test_expect_success REFFILES
'fetch --prune fails to delete branches' '
385 git clone . prune-fail &&
387 git update-ref refs/remotes/origin/extrabranch main &&
388 git pack-refs --all &&
389 : this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds &&
390 >.git/packed-refs.new &&
392 test_must_fail git fetch --prune origin
395 test_expect_success
'fetch --atomic works with a single branch' '
396 test_when_finished "rm -rf \"$D\"/atomic" &&
399 git clone . atomic &&
400 git branch atomic-branch &&
401 oid=$(git rev-parse atomic-branch) &&
402 echo "$oid" >expected &&
404 git -C atomic fetch --atomic origin &&
405 git -C atomic rev-parse origin/atomic-branch >actual &&
406 test_cmp expected actual &&
407 test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
410 test_expect_success
'fetch --atomic works with multiple branches' '
411 test_when_finished "rm -rf \"$D\"/atomic" &&
414 git clone . atomic &&
415 git branch atomic-branch-1 &&
416 git branch atomic-branch-2 &&
417 git branch atomic-branch-3 &&
418 git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
420 git -C atomic fetch --atomic origin &&
421 git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
422 test_cmp expected actual
425 test_expect_success
'fetch --atomic works with mixed branches and tags' '
426 test_when_finished "rm -rf \"$D\"/atomic" &&
429 git clone . atomic &&
430 git branch atomic-mixed-branch &&
431 git tag atomic-mixed-tag &&
432 git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
434 git -C atomic fetch --tags --atomic origin &&
435 git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
436 test_cmp expected actual
439 test_expect_success
'fetch --atomic prunes references' '
440 test_when_finished "rm -rf \"$D\"/atomic" &&
443 git branch atomic-prune-delete &&
444 git clone . atomic &&
445 git branch --delete atomic-prune-delete &&
446 git branch atomic-prune-create &&
447 git rev-parse refs/heads/atomic-prune-create >actual &&
449 git -C atomic fetch --prune --atomic origin &&
450 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
451 git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
452 test_cmp expected actual
455 test_expect_success
'fetch --atomic aborts with non-fast-forward update' '
456 test_when_finished "rm -rf \"$D\"/atomic" &&
459 git branch atomic-non-ff &&
460 git clone . atomic &&
461 git rev-parse HEAD >actual &&
463 git branch atomic-new-branch &&
464 parent_commit=$(git rev-parse atomic-non-ff~) &&
465 git update-ref refs/heads/atomic-non-ff $parent_commit &&
467 test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
468 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
469 git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
470 test_cmp expected actual &&
471 test_must_be_empty atomic/.git/FETCH_HEAD
474 test_expect_success
'fetch --atomic executes a single reference transaction only' '
475 test_when_finished "rm -rf \"$D\"/atomic" &&
478 git clone . atomic &&
479 git branch atomic-hooks-1 &&
480 git branch atomic-hooks-2 &&
481 head_oid=$(git rev-parse HEAD) &&
483 cat >expected <<-EOF &&
485 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
486 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
488 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
489 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
492 rm -f atomic/actual &&
493 test_hook -C atomic reference-transaction <<-\EOF &&
494 ( echo "$*" && cat ) >>actual
497 git -C atomic fetch --atomic origin &&
498 test_cmp expected atomic/actual
501 test_expect_success
'fetch --atomic aborts all reference updates if hook aborts' '
502 test_when_finished "rm -rf \"$D\"/atomic" &&
505 git clone . atomic &&
506 git branch atomic-hooks-abort-1 &&
507 git branch atomic-hooks-abort-2 &&
508 git branch atomic-hooks-abort-3 &&
509 git tag atomic-hooks-abort &&
510 head_oid=$(git rev-parse HEAD) &&
512 cat >expected <<-EOF &&
514 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
515 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
516 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
517 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
519 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
520 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
521 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
522 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
525 rm -f atomic/actual &&
526 test_hook -C atomic/.git reference-transaction <<-\EOF &&
527 ( echo "$*" && cat ) >>actual
531 git -C atomic for-each-ref >expected-refs &&
532 test_must_fail git -C atomic fetch --tags --atomic origin &&
533 git -C atomic for-each-ref >actual-refs &&
534 test_cmp expected-refs actual-refs &&
535 test_must_be_empty atomic/.git/FETCH_HEAD
538 test_expect_success
'fetch --atomic --append appends to FETCH_HEAD' '
539 test_when_finished "rm -rf \"$D\"/atomic" &&
542 git clone . atomic &&
543 oid=$(git rev-parse HEAD) &&
545 git branch atomic-fetch-head-1 &&
546 git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
547 test_line_count = 1 atomic/.git/FETCH_HEAD &&
549 git branch atomic-fetch-head-2 &&
550 git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
551 test_line_count = 2 atomic/.git/FETCH_HEAD &&
552 cp atomic/.git/FETCH_HEAD expected &&
554 test_hook -C atomic reference-transaction <<-\EOF &&
558 git branch atomic-fetch-head-3 &&
559 test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
560 test_cmp expected atomic/.git/FETCH_HEAD
563 test_expect_success REFFILES
'fetch --atomic fails transaction if reference locked' '
564 test_when_finished "rm -rf upstream repo" &&
567 git -C upstream commit --allow-empty -m 1 &&
568 git -C upstream switch -c foobar &&
569 git clone --mirror upstream repo &&
570 git -C upstream commit --allow-empty -m 2 &&
571 touch repo/refs/heads/foobar.lock &&
573 test_must_fail git -C repo fetch --atomic origin
576 test_expect_success
'--refmap="" ignores configured refspec' '
577 cd "$TRASH_DIRECTORY" &&
578 git clone "$D" remote-refs &&
579 git -C remote-refs rev-parse remotes/origin/main >old &&
580 git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
581 git -C remote-refs rev-parse remotes/origin/main >new &&
582 git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
583 git -C remote-refs rev-parse remotes/origin/main >actual &&
584 test_cmp new actual &&
585 git -C remote-refs fetch origin &&
586 git -C remote-refs rev-parse remotes/origin/main >actual &&
590 test_expect_success
'--refmap="" and --prune' '
591 git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
592 git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
593 git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
594 git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
595 test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
596 git -C remote-refs fetch --prune origin &&
597 test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
600 test_expect_success
'fetch tags when there is no tags' '
612 test_expect_success
'fetch following tags' '
615 git tag -a -m "annotated" anno HEAD &&
616 git tag light HEAD &&
622 git fetch .. :track &&
623 git show-ref --verify refs/tags/anno &&
624 git show-ref --verify refs/tags/light
628 test_expect_success
'fetch uses remote ref names to describe new refs' '
630 git init descriptive &&
633 git config remote.o.url .. &&
634 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
635 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
638 git tag -a -m "Descriptive tag" descriptive-tag &&
639 git branch descriptive-branch &&
640 git checkout descriptive-branch &&
641 echo "Nuts" >crazy &&
643 git commit -a -m "descriptive commit" &&
644 git update-ref refs/others/crazy HEAD &&
647 git fetch o 2>actual &&
648 test_grep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
649 test_grep "new tag.* -> descriptive-tag$" actual &&
650 test_grep "new ref.* -> crazy$" actual
655 test_expect_success
'fetch must not resolve short tag name' '
663 test_must_fail git fetch .. anno:five
667 test_expect_success
'fetch can now resolve short remote name' '
670 git update-ref refs/remotes/six/HEAD HEAD &&
679 test_expect_success
'create bundle 1' '
681 echo >file updated again by origin &&
682 git commit -a -m "tip" &&
683 git bundle create --version=3 bundle1 main^..main
686 test_expect_success
'header of bundle looks right' '
687 cat >expect <<-EOF &&
689 @object-format=$(test_oid algo)
690 -OID updated by origin
694 sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
695 test_cmp expect actual
698 test_expect_success
'create bundle 2' '
700 git bundle create bundle2 main~2..main
703 test_expect_success
'unbundle 1' '
705 git checkout -b some-branch &&
706 test_must_fail git fetch "$D/bundle1" main:main
710 test_expect_success
'bundle 1 has only 3 files ' '
712 test_bundle_object_count bundle1 3
715 test_expect_success
'unbundle 2' '
717 git fetch ../bundle2 main:main &&
718 test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
721 test_expect_success
'bundle does not prerequisite objects' '
725 git commit -m add.file2 file2 &&
726 git bundle create bundle3 -1 HEAD &&
727 test_bundle_object_count bundle3 3
730 test_expect_success
'bundle should be able to create a full history' '
733 git tag -a -m "1.0" v1.0 main &&
734 git bundle create bundle4 v1.0
738 test_expect_success
'fetch with a non-applying branch.<name>.merge' '
739 git config branch.main.remote yeti &&
740 git config branch.main.merge refs/heads/bigfoot &&
741 git config remote.blub.url one &&
742 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
746 # URL supplied to fetch does not match the url of the configured branch's remote
747 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
748 one_head=$(cd one && git rev-parse HEAD) &&
749 this_head=$(git rev-parse HEAD) &&
750 rm .git/FETCH_HEAD &&
752 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
753 test $this_head = "$(git rev-parse --verify HEAD)"
756 # URL supplied to fetch matches the url of the configured branch's remote and
757 # the merge spec matches the branch the remote HEAD points to
758 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
759 one_ref=$(cd one && git symbolic-ref HEAD) &&
760 git config branch.main.remote blub &&
761 git config branch.main.merge "$one_ref" &&
762 rm .git/FETCH_HEAD &&
764 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
765 test $this_head = "$(git rev-parse --verify HEAD)"
768 # URL supplied to fetch matches the url of the configured branch's remote, but
769 # the merge spec does not match the branch the remote HEAD points to
770 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
771 git config branch.main.merge "${one_ref}_not" &&
772 rm .git/FETCH_HEAD &&
774 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
775 test $this_head = "$(git rev-parse --verify HEAD)"
778 # the strange name is: a\!'b
779 test_expect_success
'quoting of a strangely named repo' '
780 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
781 grep "fatal: '\''a\\\\!'\''b'\''" result
784 test_expect_success
'bundle should record HEAD correctly' '
787 git bundle create bundle5 HEAD main &&
788 git bundle list-heads bundle5 >actual &&
789 for h in HEAD refs/heads/main
791 echo "$(git rev-parse --verify $h) $h" || return 1
793 test_cmp expect actual
797 test_expect_success
'mark initial state of origin/main' '
800 git tag base-origin-main refs/remotes/origin/main
804 test_expect_success
'explicit fetch should update tracking' '
807 git branch -f side &&
810 git update-ref refs/remotes/origin/main base-origin-main &&
811 o=$(git rev-parse --verify refs/remotes/origin/main) &&
812 git fetch origin main &&
813 n=$(git rev-parse --verify refs/remotes/origin/main) &&
815 test_must_fail git rev-parse --verify refs/remotes/origin/side
819 test_expect_success
'explicit pull should update tracking' '
822 git branch -f side &&
825 git update-ref refs/remotes/origin/main base-origin-main &&
826 o=$(git rev-parse --verify refs/remotes/origin/main) &&
827 git pull origin main &&
828 n=$(git rev-parse --verify refs/remotes/origin/main) &&
830 test_must_fail git rev-parse --verify refs/remotes/origin/side
834 test_expect_success
'explicit --refmap is allowed only with command-line refspec' '
838 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
842 test_expect_success
'explicit --refmap option overrides remote.*.fetch' '
844 git branch -f side &&
847 git update-ref refs/remotes/origin/main base-origin-main &&
848 o=$(git rev-parse --verify refs/remotes/origin/main) &&
849 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
850 n=$(git rev-parse --verify refs/remotes/origin/main) &&
852 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
853 git rev-parse --verify refs/remotes/other/main
857 test_expect_success
'explicitly empty --refmap option disables remote.*.fetch' '
859 git branch -f side &&
862 git update-ref refs/remotes/origin/main base-origin-main &&
863 o=$(git rev-parse --verify refs/remotes/origin/main) &&
864 git fetch --refmap="" origin main &&
865 n=$(git rev-parse --verify refs/remotes/origin/main) &&
867 test_must_fail git rev-parse --verify refs/remotes/origin/side
871 test_expect_success
'configured fetch updates tracking' '
874 git branch -f side &&
877 git update-ref refs/remotes/origin/main base-origin-main &&
878 o=$(git rev-parse --verify refs/remotes/origin/main) &&
880 n=$(git rev-parse --verify refs/remotes/origin/main) &&
882 git rev-parse --verify refs/remotes/origin/side
886 test_expect_success
'non-matching refspecs do not confuse tracking update' '
888 git update-ref refs/odd/location HEAD &&
891 git update-ref refs/remotes/origin/main base-origin-main &&
892 git config --add remote.origin.fetch \
893 refs/odd/location:refs/remotes/origin/odd &&
894 o=$(git rev-parse --verify refs/remotes/origin/main) &&
895 git fetch origin main &&
896 n=$(git rev-parse --verify refs/remotes/origin/main) &&
898 test_must_fail git rev-parse --verify refs/remotes/origin/odd
902 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
905 test_must_fail git push seven no:no
909 test_expect_success
'auto tag following fetches minimum' '
912 git clone .git follow &&
913 git checkout HEAD^0 &&
915 for i in 1 2 3 4 5 6 7
918 git commit -m $i -a &&
919 git tag -a -m $i excess-$i || exit 1
929 test_expect_success
'refuse to fetch into the current branch' '
931 test_must_fail git fetch . side:main
935 test_expect_success
'fetch into the current branch with --update-head-ok' '
937 git fetch --update-head-ok . side:main
941 test_expect_success
'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
942 rm -f .git/FETCH_HEAD err &&
943 git fetch --dry-run . 2>err &&
944 ! test -f .git/FETCH_HEAD &&
948 test_expect_success
'--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
949 rm -f .git/FETCH_HEAD err &&
950 git fetch --no-write-fetch-head . 2>err &&
951 ! test -f .git/FETCH_HEAD &&
952 ! grep FETCH_HEAD err
955 test_expect_success
'--write-fetch-head gets defeated by --dry-run' '
956 rm -f .git/FETCH_HEAD &&
957 git fetch --dry-run --write-fetch-head . &&
958 ! test -f .git/FETCH_HEAD
961 test_expect_success
"should be able to fetch with duplicate refspecs" '
966 git config branch.main.remote three &&
967 git config remote.three.url ../three/.git &&
968 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
969 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
974 test_expect_success
'LHS of refspec follows ref disambiguation rules' '
975 mkdir lhs-ambiguous &&
979 test_commit -C server unwanted &&
980 test_commit -C server wanted &&
984 # Check a name coming after "refs" alphabetically ...
985 git -C server update-ref refs/heads/s wanted &&
986 git -C server update-ref refs/heads/refs/heads/s unwanted &&
987 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
988 git -C server rev-parse wanted >expect &&
989 git -C client rev-parse checkthis >actual &&
990 test_cmp expect actual &&
992 # ... and one before.
993 git -C server update-ref refs/heads/q wanted &&
994 git -C server update-ref refs/heads/refs/heads/q unwanted &&
995 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
996 git -C server rev-parse wanted >expect &&
997 git -C client rev-parse checkthis >actual &&
998 test_cmp expect actual &&
1000 # Tags are preferred over branches like refs/{heads,tags}/*
1001 git -C server update-ref refs/tags/t wanted &&
1002 git -C server update-ref refs/heads/t unwanted &&
1003 git -C client fetch ../server +t:refs/heads/checkthis &&
1004 git -C server rev-parse wanted >expect &&
1005 git -C client rev-parse checkthis >actual
1009 test_expect_success
'fetch.writeCommitGraph' '
1010 git clone three write &&
1017 git -c fetch.writeCommitGraph fetch origin &&
1018 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
1022 test_expect_success
'fetch.writeCommitGraph with submodules' '
1023 test_config_global protocol.file.allow always &&
1024 git clone dups super &&
1027 git submodule add "file://$TRASH_DIRECTORY/three" &&
1028 git commit -m "add submodule"
1030 git clone "super" super-clone &&
1033 rm -rf .git/objects/info &&
1034 git -c fetch.writeCommitGraph=true fetch origin &&
1035 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain &&
1036 git -c fetch.writeCommitGraph=true fetch --recurse-submodules origin
1040 # fetches from first configured url
1041 test_expect_success
'fetch from multiple configured URLs in single remote' '
1043 git remote add multipleurls url1 &&
1044 git remote set-url --add multipleurls url2 &&
1045 git fetch multipleurls
1048 # configured prune tests
1050 set_config_tristate
() {
1057 git config
"$1" "$2"
1058 key
=$
(echo $1 |
sed -e 's/^remote\.origin/fetch/')
1059 git_fetch_c
="$git_fetch_c -c $key=$2"
1064 test_configured_prune
() {
1065 test_configured_prune_type
"$@" "name"
1066 test_configured_prune_type
"$@" "link"
1069 test_configured_prune_type
() {
1071 remote_origin_prune
=$2
1073 remote_origin_prune_tags
=$4
1079 if test -z "$cmdline_setup"
1081 test_expect_success
'setup cmdline_setup variable for subsequent test' '
1082 remote_url="file://$(git -C one config remote.origin.url)" &&
1083 remote_fetch="$(git -C one config remote.origin.fetch)" &&
1084 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
1088 if test "$mode" = 'link'
1092 if test "$cmdline" = ""
1094 new_cmdline
=$cmdline_setup
1096 new_cmdline
=$
(perl
-e '
1097 my ($cmdline, $url) = @ARGV;
1098 $cmdline =~ s[origin(?!/)][quotemeta($url)]ge;
1100 ' -- "$cmdline" "$remote_url")
1103 if test "$fetch_prune_tags" = 'true' ||
1104 test "$remote_origin_prune_tags" = 'true'
1106 if ! printf '%s' "$cmdline\n" |
grep -q refs
/remotes
/origin
/
1108 new_cmdline
="$new_cmdline refs/tags/*:refs/tags/*"
1112 cmdline
="$new_cmdline"
1115 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" '
1116 # make sure a newbranch is there in . and also in one
1117 git branch -f newbranch &&
1118 git tag -f newtag &&
1121 test_unconfig fetch.prune &&
1122 test_unconfig fetch.pruneTags &&
1123 test_unconfig remote.origin.prune &&
1124 test_unconfig remote.origin.pruneTags &&
1125 git fetch '"$cmdline_setup"' &&
1126 git rev-parse --verify refs/remotes/origin/newbranch &&
1127 git rev-parse --verify refs/tags/newtag
1131 git branch -d newbranch &&
1132 git tag -d newtag &&
1138 set_config_tristate fetch.prune $fetch_prune &&
1139 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
1140 set_config_tristate remote.origin.prune $remote_origin_prune &&
1141 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
1143 if test "$mode" != "link"
1147 git$git_fetch_c fetch '"$cmdline"' &&
1148 case "$expected_branch" in
1150 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
1153 git rev-parse --verify refs/remotes/origin/newbranch
1156 case "$expected_tag" in
1158 test_must_fail git rev-parse --verify refs/tags/newtag
1161 git rev-parse --verify refs/tags/newtag
1168 # $1 config: fetch.prune
1169 # $2 config: remote.<name>.prune
1170 # $3 config: fetch.pruneTags
1171 # $4 config: remote.<name>.pruneTags
1172 # $5 expect: branch to be pruned?
1173 # $6 expect: tag to be pruned?
1174 # $7 git-fetch $cmdline:
1176 # $1 $2 $3 $4 $5 $6 $7
1177 test_configured_prune
unset unset unset unset kept kept
""
1178 test_configured_prune
unset unset unset unset kept kept
"--no-prune"
1179 test_configured_prune
unset unset unset unset pruned kept
"--prune"
1180 test_configured_prune
unset unset unset unset kept pruned \
1181 "--prune origin refs/tags/*:refs/tags/*"
1182 test_configured_prune
unset unset unset unset pruned pruned \
1183 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
1185 test_configured_prune false
unset unset unset kept kept
""
1186 test_configured_prune false
unset unset unset kept kept
"--no-prune"
1187 test_configured_prune false
unset unset unset pruned kept
"--prune"
1189 test_configured_prune true
unset unset unset pruned kept
""
1190 test_configured_prune true
unset unset unset pruned kept
"--prune"
1191 test_configured_prune true
unset unset unset kept kept
"--no-prune"
1193 test_configured_prune
unset false
unset unset kept kept
""
1194 test_configured_prune
unset false
unset unset kept kept
"--no-prune"
1195 test_configured_prune
unset false
unset unset pruned kept
"--prune"
1197 test_configured_prune false false
unset unset kept kept
""
1198 test_configured_prune false false
unset unset kept kept
"--no-prune"
1199 test_configured_prune false false
unset unset pruned kept
"--prune"
1200 test_configured_prune false false
unset unset kept pruned \
1201 "--prune origin refs/tags/*:refs/tags/*"
1202 test_configured_prune false false
unset unset pruned pruned \
1203 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
1205 test_configured_prune true false
unset unset kept kept
""
1206 test_configured_prune true false
unset unset pruned kept
"--prune"
1207 test_configured_prune true false
unset unset kept kept
"--no-prune"
1209 test_configured_prune
unset true
unset unset pruned kept
""
1210 test_configured_prune
unset true
unset unset kept kept
"--no-prune"
1211 test_configured_prune
unset true
unset unset pruned kept
"--prune"
1213 test_configured_prune false true
unset unset pruned kept
""
1214 test_configured_prune false true
unset unset kept kept
"--no-prune"
1215 test_configured_prune false true
unset unset pruned kept
"--prune"
1217 test_configured_prune true true
unset unset pruned kept
""
1218 test_configured_prune true true
unset unset pruned kept
"--prune"
1219 test_configured_prune true true
unset unset kept kept
"--no-prune"
1220 test_configured_prune true true
unset unset kept pruned \
1221 "--prune origin refs/tags/*:refs/tags/*"
1222 test_configured_prune true true
unset unset pruned pruned \
1223 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
1225 # --prune-tags on its own does nothing, needs --prune as well, same
1226 # for fetch.pruneTags without fetch.prune
1227 test_configured_prune
unset unset unset unset kept kept
"--prune-tags"
1228 test_configured_prune
unset unset true
unset kept kept
""
1229 test_configured_prune
unset unset unset true kept kept
""
1231 # These will prune the tags
1232 test_configured_prune
unset unset unset unset pruned pruned
"--prune --prune-tags"
1233 test_configured_prune true
unset true
unset pruned pruned
""
1234 test_configured_prune
unset true
unset true pruned pruned
""
1236 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
1237 # remote.<name>.prune overrides fetch.prune if set.
1238 test_configured_prune true
unset true
unset pruned pruned
""
1239 test_configured_prune false true false true pruned pruned
""
1240 test_configured_prune true false true false kept kept
""
1242 # When --prune-tags is supplied it's ignored if an explicit refspec is
1243 # given, same for the configuration options.
1244 test_configured_prune
unset unset unset unset pruned kept \
1245 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
1246 test_configured_prune
unset unset true
unset pruned kept \
1247 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1248 test_configured_prune
unset unset unset true pruned kept \
1249 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1251 # Pruning that also takes place if a file:// url replaces a named
1252 # remote. However, because there's no implicit
1253 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
1254 # command-line negates --prune-tags, the branches will not be pruned.
1255 test_configured_prune_type
unset unset unset unset kept kept
"origin --prune-tags" "name"
1256 test_configured_prune_type
unset unset unset unset kept kept
"origin --prune-tags" "link"
1257 test_configured_prune_type
unset unset unset unset pruned pruned
"origin --prune --prune-tags" "name"
1258 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "link"
1259 test_configured_prune_type
unset unset unset unset pruned pruned
"--prune --prune-tags origin" "name"
1260 test_configured_prune_type
unset unset unset unset kept pruned
"--prune --prune-tags origin" "link"
1261 test_configured_prune_type
unset unset true
unset pruned pruned
"--prune origin" "name"
1262 test_configured_prune_type
unset unset true
unset kept pruned
"--prune origin" "link"
1263 test_configured_prune_type
unset unset unset true pruned pruned
"--prune origin" "name"
1264 test_configured_prune_type
unset unset unset true kept pruned
"--prune origin" "link"
1265 test_configured_prune_type true
unset true
unset pruned pruned
"origin" "name"
1266 test_configured_prune_type true
unset true
unset kept pruned
"origin" "link"
1267 test_configured_prune_type
unset true true
unset pruned pruned
"origin" "name"
1268 test_configured_prune_type
unset true true
unset kept pruned
"origin" "link"
1269 test_configured_prune_type
unset true
unset true pruned pruned
"origin" "name"
1270 test_configured_prune_type
unset true
unset true kept pruned
"origin" "link"
1272 # When all remote.origin.fetch settings are deleted a --prune
1273 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
1274 # tags, but not tracking branches, will be deleted.
1275 test_expect_success
'remove remote.origin.fetch "one"' '
1278 git config --unset-all remote.origin.fetch
1281 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "name"
1282 test_configured_prune_type
unset unset unset unset kept pruned
"origin --prune --prune-tags" "link"
1284 test_expect_success
'all boundary commits are excluded' '
1286 test_commit oneside &&
1287 git checkout HEAD^ &&
1288 test_commit otherside &&
1289 git checkout main &&
1291 git merge otherside &&
1292 ad=$(git log --no-walk --format=%ad HEAD) &&
1294 # If the a different name hash function is used here, then no delta
1295 # pair is found and the bundle does not expand to three objects
1296 # when fixing the thin object.
1297 GIT_TEST_NAME_HASH_VERSION=1 \
1298 git bundle create twoside-boundary.bdl main --since="$ad" &&
1299 test_bundle_object_count --thin twoside-boundary.bdl 3
1302 test_expect_success
'fetch --prune prints the remotes url' '
1303 git branch goodbye &&
1304 git clone . only-prunes &&
1305 git branch -D goodbye &&
1308 git fetch --prune origin 2>&1 | head -n1 >../actual
1310 echo "From ${D}/." >expect &&
1311 test_cmp expect actual
1314 test_expect_success
'branchname D/F conflict resolved by --prune' '
1315 git branch dir/file &&
1316 git clone . prune-df-conflict &&
1317 git branch -D dir/file &&
1320 cd prune-df-conflict &&
1321 git fetch --prune &&
1322 git rev-parse origin/dir >../actual
1324 git rev-parse dir >expect &&
1325 test_cmp expect actual
1328 test_expect_success
'branchname D/F conflict rejected with targeted error message' '
1329 git clone . df-conflict-error &&
1330 git branch dir_conflict &&
1332 cd df-conflict-error &&
1333 git update-ref refs/remotes/origin/dir_conflict/file HEAD &&
1334 test_must_fail git fetch 2>err &&
1335 test_grep "error: some local refs could not be updated; try running" err &&
1336 test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err &&
1337 git pack-refs --all &&
1338 test_must_fail git fetch 2>err-packed &&
1339 test_grep "error: some local refs could not be updated; try running" err-packed &&
1340 test_grep " ${SQ}git remote prune origin${SQ} to remove any old, conflicting branches" err-packed
1344 test_expect_success
'fetching a one-level ref works' '
1345 test_commit extra &&
1346 git reset --hard HEAD^ &&
1347 git update-ref refs/foo extra &&
1348 git init one-level &&
1351 git fetch .. HEAD refs/foo
1355 test_expect_success
'fetching with auto-gc does not lock up' '
1356 write_script askyesno <<-\EOF &&
1360 git clone "file://$D" auto-gc &&
1361 test_commit test2 &&
1364 git config fetch.unpackLimit 1 &&
1365 git config gc.autoPackLimit 1 &&
1366 git config gc.autoDetach false &&
1367 GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
1368 test_grep "Auto packing the repository" fetch.out &&
1369 ! grep "Should I try again" fetch.out
1373 for section
in fetch transfer
1375 test_expect_success
"$section.hideRefs affects connectivity check" '
1376 GIT_TRACE="$PWD"/trace git -c $section.hideRefs=refs -c \
1377 $section.hideRefs="!refs/tags/" fetch &&
1378 grep "git rev-list .*--exclude-hidden=fetch" trace
1382 test_expect_success
'prepare source branch' '
1383 echo one >onebranch &&
1384 git checkout --orphan onebranch &&
1385 git rm --cached -r . &&
1386 git add onebranch &&
1387 git commit -m onebranch &&
1388 git rev-list --objects onebranch -- >actual &&
1389 # 3 objects should be created, at least ...
1390 test 3 -le $(wc -l <actual)
1393 validate_store_type
() {
1394 git
-C dest count-objects
-v >actual
&&
1395 case "$store_type" in
1397 grep "^count: 0$" actual
;;
1399 grep "^packs: 0$" actual
;;
1401 echo "store_type is $store_type"
1407 test_unpack_limit
() {
1410 case "$store_type" in
1411 packed
) fetch_limit
=1 transfer_limit
=10000 ;;
1412 loose
) fetch_limit
=10000 transfer_limit
=1 ;;
1415 test_expect_success
"fetch trumps transfer limit" '
1417 git --bare init dest &&
1418 git -C dest config fetch.unpacklimit $fetch_limit &&
1419 git -C dest config transfer.unpacklimit $transfer_limit &&
1420 git -C dest fetch .. onebranch &&
1425 test_unpack_limit packed
1426 test_unpack_limit loose
1428 setup_negotiation_tip
() {
1431 USE_PROTOCOL_V2
="$3"
1433 rm -rf "$SERVER" client trace
&&
1434 git init
-b main
"$SERVER" &&
1435 test_commit
-C "$SERVER" alpha_1
&&
1436 test_commit
-C "$SERVER" alpha_2
&&
1437 git
-C "$SERVER" checkout
--orphan beta
&&
1438 test_commit
-C "$SERVER" beta_1
&&
1439 test_commit
-C "$SERVER" beta_2
&&
1441 git clone
"$URL" client
&&
1443 if test "$USE_PROTOCOL_V2" -eq 1
1445 git
-C "$SERVER" config protocol.version
2 &&
1446 git
-C client config protocol.version
2
1449 test_commit
-C "$SERVER" beta_s
&&
1450 git
-C "$SERVER" checkout main
&&
1451 test_commit
-C "$SERVER" alpha_s
&&
1452 git
-C "$SERVER" tag
-d alpha_1 alpha_2 beta_1 beta_2
1455 check_negotiation_tip
() {
1456 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
1457 ALPHA_1
=$
(git
-C client rev-parse alpha_1
) &&
1458 grep "fetch> have $ALPHA_1" trace
&&
1459 BETA_1
=$
(git
-C client rev-parse beta_1
) &&
1460 grep "fetch> have $BETA_1" trace
&&
1461 ALPHA_2
=$
(git
-C client rev-parse alpha_2
) &&
1462 ! grep "fetch> have $ALPHA_2" trace
&&
1463 BETA_2
=$
(git
-C client rev-parse beta_2
) &&
1464 ! grep "fetch> have $BETA_2" trace
1467 test_expect_success
'--negotiation-tip limits "have" lines sent' '
1468 setup_negotiation_tip server server 0 &&
1469 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1470 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1471 origin alpha_s beta_s &&
1472 check_negotiation_tip
1475 test_expect_success
'--negotiation-tip understands globs' '
1476 setup_negotiation_tip server server 0 &&
1477 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1478 --negotiation-tip=*_1 \
1479 origin alpha_s beta_s &&
1480 check_negotiation_tip
1483 test_expect_success
'--negotiation-tip understands abbreviated SHA-1' '
1484 setup_negotiation_tip server server 0 &&
1485 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1486 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1487 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1488 origin alpha_s beta_s &&
1489 check_negotiation_tip
1492 test_expect_success
'--negotiation-tip rejects missing OIDs' '
1493 setup_negotiation_tip server server 0 &&
1494 test_must_fail git -C client fetch \
1495 --negotiation-tip=alpha_1 \
1496 --negotiation-tip=$(test_oid zero) \
1497 origin alpha_s beta_s 2>err &&
1498 cat >fatal-expect <<-EOF &&
1499 fatal: the object $(test_oid zero) does not exist
1501 grep fatal: err >fatal-actual &&
1502 test_cmp fatal-expect fatal-actual
1505 test_expect_success SYMLINKS
'clone does not get confused by a D/F conflict' '
1506 git init df-conflict &&
1512 git commit -m symlink &&
1516 write_script a/hooks/post-checkout <<-EOF &&
1518 echo whoopsie >"$TRASH_DIRECTORY"/whoops
1520 git add a/hooks/post-checkout &&
1522 git commit -m post-checkout
1524 git clone df-conflict clone 2>err &&
1525 test_grep ! WHOOPS err &&
1526 test_path_is_missing whoops
1529 .
"$TEST_DIRECTORY"/lib-httpd.sh
1532 test_expect_success
'--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1533 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1534 "$HTTPD_URL/smart/server" 1 &&
1535 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1536 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1537 origin alpha_s beta_s &&
1538 check_negotiation_tip
1541 # DO NOT add non-httpd-specific tests here, because the last part of this
1542 # test script is only executed when httpd is available and enabled.