fsck: warn about symlink pointing inside a gitdir
[git.git] / t / t5510-fetch.sh
blob211afe13e9f0a9ef47edb0df09c21d3f9a1f6802
1 #!/bin/sh
2 # Copyright (c) 2006, Junio C Hamano.
4 test_description='Per branch config variables affects "git fetch".
8 . ./test-lib.sh
9 . "$TEST_DIRECTORY"/lib-bundle.sh
11 D=$(pwd)
13 test_expect_success setup '
14 echo >file original &&
15 git add file &&
16 git commit -a -m original &&
17 git branch -M main
20 test_expect_success "clone and setup child repos" '
21 git clone . one &&
23 cd one &&
24 echo >file updated by one &&
25 git commit -a -m "updated by one"
26 ) &&
27 git clone . two &&
29 cd two &&
30 git config branch.main.remote one &&
31 git config remote.one.url ../one/.git/ &&
32 git config remote.one.fetch refs/heads/main:refs/heads/one
33 ) &&
34 git clone . three &&
36 cd three &&
37 git config branch.main.remote two &&
38 git config branch.main.merge refs/heads/one &&
39 mkdir -p .git/remotes &&
40 cat >.git/remotes/two <<-\EOF
41 URL: ../two/.git/
42 Pull: refs/heads/main:refs/heads/two
43 Pull: refs/heads/one:refs/heads/one
44 EOF
45 ) &&
46 git clone . bundle &&
47 git clone . seven
50 test_expect_success "fetch test" '
51 cd "$D" &&
52 echo >file updated by origin &&
53 git commit -a -m "updated by origin" &&
54 cd two &&
55 git fetch &&
56 git rev-parse --verify refs/heads/one &&
57 mine=$(git rev-parse refs/heads/one) &&
58 his=$(cd ../one && git rev-parse refs/heads/main) &&
59 test "z$mine" = "z$his"
62 test_expect_success "fetch test for-merge" '
63 cd "$D" &&
64 cd three &&
65 git fetch &&
66 git rev-parse --verify refs/heads/two &&
67 git rev-parse --verify refs/heads/one &&
68 main_in_two=$(cd ../two && git rev-parse main) &&
69 one_in_two=$(cd ../two && git rev-parse one) &&
71 echo "$one_in_two " &&
72 echo "$main_in_two not-for-merge"
73 } >expected &&
74 cut -f -2 .git/FETCH_HEAD >actual &&
75 test_cmp expected actual'
77 test_expect_success 'fetch --prune on its own works as expected' '
78 cd "$D" &&
79 git clone . prune &&
80 cd prune &&
81 git update-ref refs/remotes/origin/extrabranch main &&
83 git fetch --prune origin &&
84 test_must_fail git rev-parse origin/extrabranch
87 test_expect_success 'fetch --prune with a branch name keeps branches' '
88 cd "$D" &&
89 git clone . prune-branch &&
90 cd prune-branch &&
91 git update-ref refs/remotes/origin/extrabranch main &&
93 git fetch --prune origin main &&
94 git rev-parse origin/extrabranch
97 test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
98 cd "$D" &&
99 git clone . prune-namespace &&
100 cd prune-namespace &&
102 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
103 git rev-parse origin/main
106 test_expect_success 'fetch --prune handles overlapping refspecs' '
107 cd "$D" &&
108 git update-ref refs/pull/42/head main &&
109 git clone . prune-overlapping &&
110 cd prune-overlapping &&
111 git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
113 git fetch --prune origin &&
114 git rev-parse origin/main &&
115 git rev-parse origin/pr/42 &&
117 git config --unset-all remote.origin.fetch &&
118 git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
119 git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
121 git fetch --prune origin &&
122 git rev-parse origin/main &&
123 git rev-parse origin/pr/42
126 test_expect_success 'fetch --prune --tags prunes branches but not tags' '
127 cd "$D" &&
128 git clone . prune-tags &&
129 cd prune-tags &&
130 git tag sometag main &&
131 # Create what looks like a remote-tracking branch from an earlier
132 # fetch that has since been deleted from the remote:
133 git update-ref refs/remotes/origin/fake-remote main &&
135 git fetch --prune --tags origin &&
136 git rev-parse origin/main &&
137 test_must_fail git rev-parse origin/fake-remote &&
138 git rev-parse sometag
141 test_expect_success 'fetch --prune --tags with branch does not prune other things' '
142 cd "$D" &&
143 git clone . prune-tags-branch &&
144 cd prune-tags-branch &&
145 git tag sometag main &&
146 git update-ref refs/remotes/origin/extrabranch main &&
148 git fetch --prune --tags origin main &&
149 git rev-parse origin/extrabranch &&
150 git rev-parse sometag
153 test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
154 cd "$D" &&
155 git clone . prune-tags-refspec &&
156 cd prune-tags-refspec &&
157 git tag sometag main &&
158 git update-ref refs/remotes/origin/foo/otherbranch main &&
159 git update-ref refs/remotes/origin/extrabranch main &&
161 git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
162 test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
163 git rev-parse origin/extrabranch &&
164 git rev-parse sometag
167 test_expect_success REFFILES 'fetch --prune fails to delete branches' '
168 cd "$D" &&
169 git clone . prune-fail &&
170 cd prune-fail &&
171 git update-ref refs/remotes/origin/extrabranch main &&
172 : this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds &&
173 >.git/packed-refs.new &&
175 test_must_fail git fetch --prune origin
178 test_expect_success 'fetch --atomic works with a single branch' '
179 test_when_finished "rm -rf \"$D\"/atomic" &&
181 cd "$D" &&
182 git clone . atomic &&
183 git branch atomic-branch &&
184 oid=$(git rev-parse atomic-branch) &&
185 echo "$oid" >expected &&
187 git -C atomic fetch --atomic origin &&
188 git -C atomic rev-parse origin/atomic-branch >actual &&
189 test_cmp expected actual &&
190 test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
193 test_expect_success 'fetch --atomic works with multiple branches' '
194 test_when_finished "rm -rf \"$D\"/atomic" &&
196 cd "$D" &&
197 git clone . atomic &&
198 git branch atomic-branch-1 &&
199 git branch atomic-branch-2 &&
200 git branch atomic-branch-3 &&
201 git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
203 git -C atomic fetch --atomic origin &&
204 git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
205 test_cmp expected actual
208 test_expect_success 'fetch --atomic works with mixed branches and tags' '
209 test_when_finished "rm -rf \"$D\"/atomic" &&
211 cd "$D" &&
212 git clone . atomic &&
213 git branch atomic-mixed-branch &&
214 git tag atomic-mixed-tag &&
215 git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
217 git -C atomic fetch --tags --atomic origin &&
218 git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
219 test_cmp expected actual
222 test_expect_success 'fetch --atomic prunes references' '
223 test_when_finished "rm -rf \"$D\"/atomic" &&
225 cd "$D" &&
226 git branch atomic-prune-delete &&
227 git clone . atomic &&
228 git branch --delete atomic-prune-delete &&
229 git branch atomic-prune-create &&
230 git rev-parse refs/heads/atomic-prune-create >actual &&
232 git -C atomic fetch --prune --atomic origin &&
233 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
234 git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
235 test_cmp expected actual
238 test_expect_success 'fetch --atomic aborts with non-fast-forward update' '
239 test_when_finished "rm -rf \"$D\"/atomic" &&
241 cd "$D" &&
242 git branch atomic-non-ff &&
243 git clone . atomic &&
244 git rev-parse HEAD >actual &&
246 git branch atomic-new-branch &&
247 parent_commit=$(git rev-parse atomic-non-ff~) &&
248 git update-ref refs/heads/atomic-non-ff $parent_commit &&
250 test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
251 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
252 git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
253 test_cmp expected actual &&
254 test_must_be_empty atomic/.git/FETCH_HEAD
257 test_expect_success 'fetch --atomic executes a single reference transaction only' '
258 test_when_finished "rm -rf \"$D\"/atomic" &&
260 cd "$D" &&
261 git clone . atomic &&
262 git branch atomic-hooks-1 &&
263 git branch atomic-hooks-2 &&
264 head_oid=$(git rev-parse HEAD) &&
266 cat >expected <<-EOF &&
267 prepared
268 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
269 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
270 committed
271 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
272 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
275 rm -f atomic/actual &&
276 test_hook -C atomic reference-transaction <<-\EOF &&
277 ( echo "$*" && cat ) >>actual
280 git -C atomic fetch --atomic origin &&
281 test_cmp expected atomic/actual
284 test_expect_success 'fetch --atomic aborts all reference updates if hook aborts' '
285 test_when_finished "rm -rf \"$D\"/atomic" &&
287 cd "$D" &&
288 git clone . atomic &&
289 git branch atomic-hooks-abort-1 &&
290 git branch atomic-hooks-abort-2 &&
291 git branch atomic-hooks-abort-3 &&
292 git tag atomic-hooks-abort &&
293 head_oid=$(git rev-parse HEAD) &&
295 cat >expected <<-EOF &&
296 prepared
297 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
298 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
299 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
300 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
301 aborted
302 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
303 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
304 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
305 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
308 rm -f atomic/actual &&
309 test_hook -C atomic/.git reference-transaction <<-\EOF &&
310 ( echo "$*" && cat ) >>actual
311 exit 1
314 git -C atomic for-each-ref >expected-refs &&
315 test_must_fail git -C atomic fetch --tags --atomic origin &&
316 git -C atomic for-each-ref >actual-refs &&
317 test_cmp expected-refs actual-refs &&
318 test_must_be_empty atomic/.git/FETCH_HEAD
321 test_expect_success 'fetch --atomic --append appends to FETCH_HEAD' '
322 test_when_finished "rm -rf \"$D\"/atomic" &&
324 cd "$D" &&
325 git clone . atomic &&
326 oid=$(git rev-parse HEAD) &&
328 git branch atomic-fetch-head-1 &&
329 git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
330 test_line_count = 1 atomic/.git/FETCH_HEAD &&
332 git branch atomic-fetch-head-2 &&
333 git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
334 test_line_count = 2 atomic/.git/FETCH_HEAD &&
335 cp atomic/.git/FETCH_HEAD expected &&
337 test_hook -C atomic reference-transaction <<-\EOF &&
338 exit 1
341 git branch atomic-fetch-head-3 &&
342 test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
343 test_cmp expected atomic/.git/FETCH_HEAD
346 test_expect_success '--refmap="" ignores configured refspec' '
347 cd "$TRASH_DIRECTORY" &&
348 git clone "$D" remote-refs &&
349 git -C remote-refs rev-parse remotes/origin/main >old &&
350 git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
351 git -C remote-refs rev-parse remotes/origin/main >new &&
352 git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
353 git -C remote-refs rev-parse remotes/origin/main >actual &&
354 test_cmp new actual &&
355 git -C remote-refs fetch origin &&
356 git -C remote-refs rev-parse remotes/origin/main >actual &&
357 test_cmp old actual
360 test_expect_success '--refmap="" and --prune' '
361 git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
362 git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
363 git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
364 git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
365 test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
366 git -C remote-refs fetch --prune origin &&
367 test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
370 test_expect_success 'fetch tags when there is no tags' '
372 cd "$D" &&
374 mkdir notags &&
375 cd notags &&
376 git init &&
378 git fetch -t ..
382 test_expect_success 'fetch following tags' '
384 cd "$D" &&
385 git tag -a -m "annotated" anno HEAD &&
386 git tag light HEAD &&
388 mkdir four &&
389 cd four &&
390 git init &&
392 git fetch .. :track &&
393 git show-ref --verify refs/tags/anno &&
394 git show-ref --verify refs/tags/light
398 test_expect_success 'fetch uses remote ref names to describe new refs' '
399 cd "$D" &&
400 git init descriptive &&
402 cd descriptive &&
403 git config remote.o.url .. &&
404 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
405 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
406 git fetch o
407 ) &&
408 git tag -a -m "Descriptive tag" descriptive-tag &&
409 git branch descriptive-branch &&
410 git checkout descriptive-branch &&
411 echo "Nuts" >crazy &&
412 git add crazy &&
413 git commit -a -m "descriptive commit" &&
414 git update-ref refs/others/crazy HEAD &&
416 cd descriptive &&
417 git fetch o 2>actual &&
418 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
419 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
420 test_i18ngrep "new ref.* -> crazy$" actual
421 ) &&
422 git checkout main
425 test_expect_success 'fetch must not resolve short tag name' '
427 cd "$D" &&
429 mkdir five &&
430 cd five &&
431 git init &&
433 test_must_fail git fetch .. anno:five
437 test_expect_success 'fetch can now resolve short remote name' '
439 cd "$D" &&
440 git update-ref refs/remotes/six/HEAD HEAD &&
442 mkdir six &&
443 cd six &&
444 git init &&
446 git fetch .. six:six
449 test_expect_success 'create bundle 1' '
450 cd "$D" &&
451 echo >file updated again by origin &&
452 git commit -a -m "tip" &&
453 git bundle create --version=3 bundle1 main^..main
456 test_expect_success 'header of bundle looks right' '
457 cat >expect <<-EOF &&
458 # v3 git bundle
459 @object-format=$(test_oid algo)
460 -OID updated by origin
461 OID refs/heads/main
464 sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
465 test_cmp expect actual
468 test_expect_success 'create bundle 2' '
469 cd "$D" &&
470 git bundle create bundle2 main~2..main
473 test_expect_success 'unbundle 1' '
474 cd "$D/bundle" &&
475 git checkout -b some-branch &&
476 test_must_fail git fetch "$D/bundle1" main:main
480 test_expect_success 'bundle 1 has only 3 files ' '
481 cd "$D" &&
482 test_bundle_object_count bundle1 3
485 test_expect_success 'unbundle 2' '
486 cd "$D/bundle" &&
487 git fetch ../bundle2 main:main &&
488 test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
491 test_expect_success 'bundle does not prerequisite objects' '
492 cd "$D" &&
493 touch file2 &&
494 git add file2 &&
495 git commit -m add.file2 file2 &&
496 git bundle create bundle3 -1 HEAD &&
497 test_bundle_object_count bundle3 3
500 test_expect_success 'bundle should be able to create a full history' '
502 cd "$D" &&
503 git tag -a -m "1.0" v1.0 main &&
504 git bundle create bundle4 v1.0
508 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
509 git config branch.main.remote yeti &&
510 git config branch.main.merge refs/heads/bigfoot &&
511 git config remote.blub.url one &&
512 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
513 git fetch blub
516 # URL supplied to fetch does not match the url of the configured branch's remote
517 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
518 one_head=$(cd one && git rev-parse HEAD) &&
519 this_head=$(git rev-parse HEAD) &&
520 git update-ref -d FETCH_HEAD &&
521 git fetch one &&
522 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
523 test $this_head = "$(git rev-parse --verify HEAD)"
526 # URL supplied to fetch matches the url of the configured branch's remote and
527 # the merge spec matches the branch the remote HEAD points to
528 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
529 one_ref=$(cd one && git symbolic-ref HEAD) &&
530 git config branch.main.remote blub &&
531 git config branch.main.merge "$one_ref" &&
532 git update-ref -d FETCH_HEAD &&
533 git fetch one &&
534 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
535 test $this_head = "$(git rev-parse --verify HEAD)"
538 # URL supplied to fetch matches the url of the configured branch's remote, but
539 # the merge spec does not match the branch the remote HEAD points to
540 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
541 git config branch.main.merge "${one_ref}_not" &&
542 git update-ref -d FETCH_HEAD &&
543 git fetch one &&
544 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
545 test $this_head = "$(git rev-parse --verify HEAD)"
548 # the strange name is: a\!'b
549 test_expect_success 'quoting of a strangely named repo' '
550 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
551 grep "fatal: '\''a\\\\!'\''b'\''" result
554 test_expect_success 'bundle should record HEAD correctly' '
556 cd "$D" &&
557 git bundle create bundle5 HEAD main &&
558 git bundle list-heads bundle5 >actual &&
559 for h in HEAD refs/heads/main
561 echo "$(git rev-parse --verify $h) $h" || return 1
562 done >expect &&
563 test_cmp expect actual
567 test_expect_success 'mark initial state of origin/main' '
569 cd three &&
570 git tag base-origin-main refs/remotes/origin/main
574 test_expect_success 'explicit fetch should update tracking' '
576 cd "$D" &&
577 git branch -f side &&
579 cd three &&
580 git update-ref refs/remotes/origin/main base-origin-main &&
581 o=$(git rev-parse --verify refs/remotes/origin/main) &&
582 git fetch origin main &&
583 n=$(git rev-parse --verify refs/remotes/origin/main) &&
584 test "$o" != "$n" &&
585 test_must_fail git rev-parse --verify refs/remotes/origin/side
589 test_expect_success 'explicit pull should update tracking' '
591 cd "$D" &&
592 git branch -f side &&
594 cd three &&
595 git update-ref refs/remotes/origin/main base-origin-main &&
596 o=$(git rev-parse --verify refs/remotes/origin/main) &&
597 git pull origin main &&
598 n=$(git rev-parse --verify refs/remotes/origin/main) &&
599 test "$o" != "$n" &&
600 test_must_fail git rev-parse --verify refs/remotes/origin/side
604 test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
605 cd "$D" &&
607 cd three &&
608 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
612 test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
613 cd "$D" &&
614 git branch -f side &&
616 cd three &&
617 git update-ref refs/remotes/origin/main base-origin-main &&
618 o=$(git rev-parse --verify refs/remotes/origin/main) &&
619 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
620 n=$(git rev-parse --verify refs/remotes/origin/main) &&
621 test "$o" = "$n" &&
622 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
623 git rev-parse --verify refs/remotes/other/main
627 test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
628 cd "$D" &&
629 git branch -f side &&
631 cd three &&
632 git update-ref refs/remotes/origin/main base-origin-main &&
633 o=$(git rev-parse --verify refs/remotes/origin/main) &&
634 git fetch --refmap="" origin main &&
635 n=$(git rev-parse --verify refs/remotes/origin/main) &&
636 test "$o" = "$n" &&
637 test_must_fail git rev-parse --verify refs/remotes/origin/side
641 test_expect_success 'configured fetch updates tracking' '
643 cd "$D" &&
644 git branch -f side &&
646 cd three &&
647 git update-ref refs/remotes/origin/main base-origin-main &&
648 o=$(git rev-parse --verify refs/remotes/origin/main) &&
649 git fetch origin &&
650 n=$(git rev-parse --verify refs/remotes/origin/main) &&
651 test "$o" != "$n" &&
652 git rev-parse --verify refs/remotes/origin/side
656 test_expect_success 'non-matching refspecs do not confuse tracking update' '
657 cd "$D" &&
658 git update-ref refs/odd/location HEAD &&
660 cd three &&
661 git update-ref refs/remotes/origin/main base-origin-main &&
662 git config --add remote.origin.fetch \
663 refs/odd/location:refs/remotes/origin/odd &&
664 o=$(git rev-parse --verify refs/remotes/origin/main) &&
665 git fetch origin main &&
666 n=$(git rev-parse --verify refs/remotes/origin/main) &&
667 test "$o" != "$n" &&
668 test_must_fail git rev-parse --verify refs/remotes/origin/odd
672 test_expect_success 'pushing nonexistent branch by mistake should not segv' '
674 cd "$D" &&
675 test_must_fail git push seven no:no
679 test_expect_success 'auto tag following fetches minimum' '
681 cd "$D" &&
682 git clone .git follow &&
683 git checkout HEAD^0 &&
685 for i in 1 2 3 4 5 6 7
687 echo $i >>file &&
688 git commit -m $i -a &&
689 git tag -a -m $i excess-$i || exit 1
690 done
691 ) &&
692 git checkout main &&
694 cd follow &&
695 git fetch
699 test_expect_success 'refuse to fetch into the current branch' '
701 test_must_fail git fetch . side:main
705 test_expect_success 'fetch into the current branch with --update-head-ok' '
707 git fetch --update-head-ok . side:main
711 test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
712 rm -f .git/FETCH_HEAD err &&
713 git fetch --dry-run . 2>err &&
714 ! test -f .git/FETCH_HEAD &&
715 grep FETCH_HEAD err
718 test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
719 rm -f .git/FETCH_HEAD err &&
720 git fetch --no-write-fetch-head . 2>err &&
721 ! test -f .git/FETCH_HEAD &&
722 ! grep FETCH_HEAD err
725 test_expect_success '--write-fetch-head gets defeated by --dry-run' '
726 rm -f .git/FETCH_HEAD &&
727 git fetch --dry-run --write-fetch-head . &&
728 ! test -f .git/FETCH_HEAD
731 test_expect_success "should be able to fetch with duplicate refspecs" '
732 mkdir dups &&
734 cd dups &&
735 git init &&
736 git config branch.main.remote three &&
737 git config remote.three.url ../three/.git &&
738 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
739 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
740 git fetch three
744 test_expect_success 'LHS of refspec follows ref disambiguation rules' '
745 mkdir lhs-ambiguous &&
747 cd lhs-ambiguous &&
748 git init server &&
749 test_commit -C server unwanted &&
750 test_commit -C server wanted &&
752 git init client &&
754 # Check a name coming after "refs" alphabetically ...
755 git -C server update-ref refs/heads/s wanted &&
756 git -C server update-ref refs/heads/refs/heads/s unwanted &&
757 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
758 git -C server rev-parse wanted >expect &&
759 git -C client rev-parse checkthis >actual &&
760 test_cmp expect actual &&
762 # ... and one before.
763 git -C server update-ref refs/heads/q wanted &&
764 git -C server update-ref refs/heads/refs/heads/q unwanted &&
765 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
766 git -C server rev-parse wanted >expect &&
767 git -C client rev-parse checkthis >actual &&
768 test_cmp expect actual &&
770 # Tags are preferred over branches like refs/{heads,tags}/*
771 git -C server update-ref refs/tags/t wanted &&
772 git -C server update-ref refs/heads/t unwanted &&
773 git -C client fetch ../server +t:refs/heads/checkthis &&
774 git -C server rev-parse wanted >expect &&
775 git -C client rev-parse checkthis >actual
779 test_expect_success 'fetch.writeCommitGraph' '
780 git clone three write &&
782 cd three &&
783 test_commit new
784 ) &&
786 cd write &&
787 git -c fetch.writeCommitGraph fetch origin &&
788 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
792 test_expect_success 'fetch.writeCommitGraph with submodules' '
793 test_config_global protocol.file.allow always &&
794 git clone dups super &&
796 cd super &&
797 git submodule add "file://$TRASH_DIRECTORY/three" &&
798 git commit -m "add submodule"
799 ) &&
800 git clone "super" super-clone &&
802 cd super-clone &&
803 rm -rf .git/objects/info &&
804 git -c fetch.writeCommitGraph=true fetch origin &&
805 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
809 # configured prune tests
811 set_config_tristate () {
812 # var=$1 val=$2
813 case "$2" in
814 unset)
815 test_unconfig "$1"
818 git config "$1" "$2"
819 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
820 git_fetch_c="$git_fetch_c -c $key=$2"
822 esac
825 test_configured_prune () {
826 test_configured_prune_type "$@" "name"
827 test_configured_prune_type "$@" "link"
830 test_configured_prune_type () {
831 fetch_prune=$1
832 remote_origin_prune=$2
833 fetch_prune_tags=$3
834 remote_origin_prune_tags=$4
835 expected_branch=$5
836 expected_tag=$6
837 cmdline=$7
838 mode=$8
840 if test -z "$cmdline_setup"
841 then
842 test_expect_success 'setup cmdline_setup variable for subsequent test' '
843 remote_url="file://$(git -C one config remote.origin.url)" &&
844 remote_fetch="$(git -C one config remote.origin.fetch)" &&
845 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
849 if test "$mode" = 'link'
850 then
851 new_cmdline=""
853 if test "$cmdline" = ""
854 then
855 new_cmdline=$cmdline_setup
856 else
857 new_cmdline=$(perl -e '
858 my ($cmdline, $url) = @ARGV;
859 $cmdline =~ s[origin(?!/)][quotemeta($url)]ge;
860 print $cmdline;
861 ' -- "$cmdline" "$remote_url")
864 if test "$fetch_prune_tags" = 'true' ||
865 test "$remote_origin_prune_tags" = 'true'
866 then
867 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
868 then
869 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
873 cmdline="$new_cmdline"
876 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" '
877 # make sure a newbranch is there in . and also in one
878 git branch -f newbranch &&
879 git tag -f newtag &&
881 cd one &&
882 test_unconfig fetch.prune &&
883 test_unconfig fetch.pruneTags &&
884 test_unconfig remote.origin.prune &&
885 test_unconfig remote.origin.pruneTags &&
886 git fetch '"$cmdline_setup"' &&
887 git rev-parse --verify refs/remotes/origin/newbranch &&
888 git rev-parse --verify refs/tags/newtag
889 ) &&
891 # now remove them
892 git branch -d newbranch &&
893 git tag -d newtag &&
895 # then test
897 cd one &&
898 git_fetch_c="" &&
899 set_config_tristate fetch.prune $fetch_prune &&
900 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
901 set_config_tristate remote.origin.prune $remote_origin_prune &&
902 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
904 if test "$mode" != "link"
905 then
906 git_fetch_c=""
907 fi &&
908 git$git_fetch_c fetch '"$cmdline"' &&
909 case "$expected_branch" in
910 pruned)
911 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
913 kept)
914 git rev-parse --verify refs/remotes/origin/newbranch
916 esac &&
917 case "$expected_tag" in
918 pruned)
919 test_must_fail git rev-parse --verify refs/tags/newtag
921 kept)
922 git rev-parse --verify refs/tags/newtag
924 esac
929 # $1 config: fetch.prune
930 # $2 config: remote.<name>.prune
931 # $3 config: fetch.pruneTags
932 # $4 config: remote.<name>.pruneTags
933 # $5 expect: branch to be pruned?
934 # $6 expect: tag to be pruned?
935 # $7 git-fetch $cmdline:
937 # $1 $2 $3 $4 $5 $6 $7
938 test_configured_prune unset unset unset unset kept kept ""
939 test_configured_prune unset unset unset unset kept kept "--no-prune"
940 test_configured_prune unset unset unset unset pruned kept "--prune"
941 test_configured_prune unset unset unset unset kept pruned \
942 "--prune origin refs/tags/*:refs/tags/*"
943 test_configured_prune unset unset unset unset pruned pruned \
944 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
946 test_configured_prune false unset unset unset kept kept ""
947 test_configured_prune false unset unset unset kept kept "--no-prune"
948 test_configured_prune false unset unset unset pruned kept "--prune"
950 test_configured_prune true unset unset unset pruned kept ""
951 test_configured_prune true unset unset unset pruned kept "--prune"
952 test_configured_prune true unset unset unset kept kept "--no-prune"
954 test_configured_prune unset false unset unset kept kept ""
955 test_configured_prune unset false unset unset kept kept "--no-prune"
956 test_configured_prune unset false unset unset pruned kept "--prune"
958 test_configured_prune false false unset unset kept kept ""
959 test_configured_prune false false unset unset kept kept "--no-prune"
960 test_configured_prune false false unset unset pruned kept "--prune"
961 test_configured_prune false false unset unset kept pruned \
962 "--prune origin refs/tags/*:refs/tags/*"
963 test_configured_prune false false unset unset pruned pruned \
964 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
966 test_configured_prune true false unset unset kept kept ""
967 test_configured_prune true false unset unset pruned kept "--prune"
968 test_configured_prune true false unset unset kept kept "--no-prune"
970 test_configured_prune unset true unset unset pruned kept ""
971 test_configured_prune unset true unset unset kept kept "--no-prune"
972 test_configured_prune unset true unset unset pruned kept "--prune"
974 test_configured_prune false true unset unset pruned kept ""
975 test_configured_prune false true unset unset kept kept "--no-prune"
976 test_configured_prune false true unset unset pruned kept "--prune"
978 test_configured_prune true true unset unset pruned kept ""
979 test_configured_prune true true unset unset pruned kept "--prune"
980 test_configured_prune true true unset unset kept kept "--no-prune"
981 test_configured_prune true true unset unset kept pruned \
982 "--prune origin refs/tags/*:refs/tags/*"
983 test_configured_prune true true unset unset pruned pruned \
984 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
986 # --prune-tags on its own does nothing, needs --prune as well, same
987 # for fetch.pruneTags without fetch.prune
988 test_configured_prune unset unset unset unset kept kept "--prune-tags"
989 test_configured_prune unset unset true unset kept kept ""
990 test_configured_prune unset unset unset true kept kept ""
992 # These will prune the tags
993 test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
994 test_configured_prune true unset true unset pruned pruned ""
995 test_configured_prune unset true unset true pruned pruned ""
997 # remote.<name>.pruneTags overrides fetch.pruneTags, just like
998 # remote.<name>.prune overrides fetch.prune if set.
999 test_configured_prune true unset true unset pruned pruned ""
1000 test_configured_prune false true false true pruned pruned ""
1001 test_configured_prune true false true false kept kept ""
1003 # When --prune-tags is supplied it's ignored if an explicit refspec is
1004 # given, same for the configuration options.
1005 test_configured_prune unset unset unset unset pruned kept \
1006 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
1007 test_configured_prune unset unset true unset pruned kept \
1008 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1009 test_configured_prune unset unset unset true pruned kept \
1010 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1012 # Pruning that also takes place if a file:// url replaces a named
1013 # remote. However, because there's no implicit
1014 # +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
1015 # command-line negates --prune-tags, the branches will not be pruned.
1016 test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
1017 test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
1018 test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
1019 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
1020 test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
1021 test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
1022 test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
1023 test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
1024 test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
1025 test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
1026 test_configured_prune_type true unset true unset pruned pruned "origin" "name"
1027 test_configured_prune_type true unset true unset kept pruned "origin" "link"
1028 test_configured_prune_type unset true true unset pruned pruned "origin" "name"
1029 test_configured_prune_type unset true true unset kept pruned "origin" "link"
1030 test_configured_prune_type unset true unset true pruned pruned "origin" "name"
1031 test_configured_prune_type unset true unset true kept pruned "origin" "link"
1033 # When all remote.origin.fetch settings are deleted a --prune
1034 # --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
1035 # tags, but not tracking branches, will be deleted.
1036 test_expect_success 'remove remote.origin.fetch "one"' '
1038 cd one &&
1039 git config --unset-all remote.origin.fetch
1042 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
1043 test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
1045 test_expect_success 'all boundary commits are excluded' '
1046 test_commit base &&
1047 test_commit oneside &&
1048 git checkout HEAD^ &&
1049 test_commit otherside &&
1050 git checkout main &&
1051 test_tick &&
1052 git merge otherside &&
1053 ad=$(git log --no-walk --format=%ad HEAD) &&
1054 git bundle create twoside-boundary.bdl main --since="$ad" &&
1055 test_bundle_object_count --thin twoside-boundary.bdl 3
1058 test_expect_success 'fetch --prune prints the remotes url' '
1059 git branch goodbye &&
1060 git clone . only-prunes &&
1061 git branch -D goodbye &&
1063 cd only-prunes &&
1064 git fetch --prune origin 2>&1 | head -n1 >../actual
1065 ) &&
1066 echo "From ${D}/." >expect &&
1067 test_cmp expect actual
1070 test_expect_success 'branchname D/F conflict resolved by --prune' '
1071 git branch dir/file &&
1072 git clone . prune-df-conflict &&
1073 git branch -D dir/file &&
1074 git branch dir &&
1076 cd prune-df-conflict &&
1077 git fetch --prune &&
1078 git rev-parse origin/dir >../actual
1079 ) &&
1080 git rev-parse dir >expect &&
1081 test_cmp expect actual
1084 test_expect_success 'fetching a one-level ref works' '
1085 test_commit extra &&
1086 git reset --hard HEAD^ &&
1087 git update-ref refs/foo extra &&
1088 git init one-level &&
1090 cd one-level &&
1091 git fetch .. HEAD refs/foo
1095 test_expect_success 'fetching with auto-gc does not lock up' '
1096 write_script askyesno <<-\EOF &&
1097 echo "$*" &&
1098 false
1100 git clone "file://$D" auto-gc &&
1101 test_commit test2 &&
1103 cd auto-gc &&
1104 git config fetch.unpackLimit 1 &&
1105 git config gc.autoPackLimit 1 &&
1106 git config gc.autoDetach false &&
1107 GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
1108 test_i18ngrep "Auto packing the repository" fetch.out &&
1109 ! grep "Should I try again" fetch.out
1113 test_expect_success 'fetch aligned output' '
1114 git clone . full-output &&
1115 test_commit looooooooooooong-tag &&
1117 cd full-output &&
1118 git -c fetch.output=full fetch origin >actual 2>&1 &&
1119 grep -e "->" actual | cut -c 22- >../actual
1120 ) &&
1121 cat >expect <<-\EOF &&
1122 main -> origin/main
1123 looooooooooooong-tag -> looooooooooooong-tag
1125 test_cmp expect actual
1128 test_expect_success 'fetch compact output' '
1129 git clone . compact &&
1130 test_commit extraaa &&
1132 cd compact &&
1133 git -c fetch.output=compact fetch origin >actual 2>&1 &&
1134 grep -e "->" actual | cut -c 22- >../actual
1135 ) &&
1136 cat >expect <<-\EOF &&
1137 main -> origin/*
1138 extraaa -> *
1140 test_cmp expect actual
1143 test_expect_success '--no-show-forced-updates' '
1144 mkdir forced-updates &&
1146 cd forced-updates &&
1147 git init &&
1148 test_commit 1 &&
1149 test_commit 2
1150 ) &&
1151 git clone forced-updates forced-update-clone &&
1152 git clone forced-updates no-forced-update-clone &&
1153 git -C forced-updates reset --hard HEAD~1 &&
1155 cd forced-update-clone &&
1156 git fetch --show-forced-updates origin 2>output &&
1157 test_i18ngrep "(forced update)" output
1158 ) &&
1160 cd no-forced-update-clone &&
1161 git fetch --no-show-forced-updates origin 2>output &&
1162 test_i18ngrep ! "(forced update)" output
1166 setup_negotiation_tip () {
1167 SERVER="$1"
1168 URL="$2"
1169 USE_PROTOCOL_V2="$3"
1171 rm -rf "$SERVER" client trace &&
1172 git init -b main "$SERVER" &&
1173 test_commit -C "$SERVER" alpha_1 &&
1174 test_commit -C "$SERVER" alpha_2 &&
1175 git -C "$SERVER" checkout --orphan beta &&
1176 test_commit -C "$SERVER" beta_1 &&
1177 test_commit -C "$SERVER" beta_2 &&
1179 git clone "$URL" client &&
1181 if test "$USE_PROTOCOL_V2" -eq 1
1182 then
1183 git -C "$SERVER" config protocol.version 2 &&
1184 git -C client config protocol.version 2
1185 fi &&
1187 test_commit -C "$SERVER" beta_s &&
1188 git -C "$SERVER" checkout main &&
1189 test_commit -C "$SERVER" alpha_s &&
1190 git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
1193 check_negotiation_tip () {
1194 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
1195 ALPHA_1=$(git -C client rev-parse alpha_1) &&
1196 grep "fetch> have $ALPHA_1" trace &&
1197 BETA_1=$(git -C client rev-parse beta_1) &&
1198 grep "fetch> have $BETA_1" trace &&
1199 ALPHA_2=$(git -C client rev-parse alpha_2) &&
1200 ! grep "fetch> have $ALPHA_2" trace &&
1201 BETA_2=$(git -C client rev-parse beta_2) &&
1202 ! grep "fetch> have $BETA_2" trace
1205 test_expect_success '--negotiation-tip limits "have" lines sent' '
1206 setup_negotiation_tip server server 0 &&
1207 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1208 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1209 origin alpha_s beta_s &&
1210 check_negotiation_tip
1213 test_expect_success '--negotiation-tip understands globs' '
1214 setup_negotiation_tip server server 0 &&
1215 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1216 --negotiation-tip=*_1 \
1217 origin alpha_s beta_s &&
1218 check_negotiation_tip
1221 test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
1222 setup_negotiation_tip server server 0 &&
1223 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1224 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1225 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1226 origin alpha_s beta_s &&
1227 check_negotiation_tip
1230 test_expect_success '--negotiation-tip rejects missing OIDs' '
1231 setup_negotiation_tip server server 0 &&
1232 test_must_fail git -C client fetch \
1233 --negotiation-tip=alpha_1 \
1234 --negotiation-tip=$(test_oid zero) \
1235 origin alpha_s beta_s 2>err &&
1236 cat >fatal-expect <<-EOF &&
1237 fatal: the object $(test_oid zero) does not exist
1239 grep fatal: err >fatal-actual &&
1240 test_cmp fatal-expect fatal-actual
1243 test_expect_success SYMLINKS 'clone does not get confused by a D/F conflict' '
1244 git init df-conflict &&
1246 cd df-conflict &&
1247 ln -s .git a &&
1248 git add a &&
1249 test_tick &&
1250 git commit -m symlink &&
1251 test_commit a- &&
1252 rm a &&
1253 mkdir -p a/hooks &&
1254 write_script a/hooks/post-checkout <<-EOF &&
1255 echo WHOOPSIE >&2
1256 echo whoopsie >"$TRASH_DIRECTORY"/whoops
1258 git add a/hooks/post-checkout &&
1259 test_tick &&
1260 git commit -m post-checkout
1261 ) &&
1262 git clone df-conflict clone 2>err &&
1263 ! grep WHOOPS err &&
1264 test_path_is_missing whoops
1267 . "$TEST_DIRECTORY"/lib-httpd.sh
1268 start_httpd
1270 test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1271 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1272 "$HTTPD_URL/smart/server" 1 &&
1273 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1274 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1275 origin alpha_s beta_s &&
1276 check_negotiation_tip
1279 # DO NOT add non-httpd-specific tests here, because the last part of this
1280 # test script is only executed when httpd is available and enabled.
1282 test_done