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 test -f .git/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 test -f .git/refs/heads/two &&
77 test -f .git/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 &&
358 grep "fatal: '\''a\\\\!'\''b'\''" result
361 test_expect_success
'bundle should record HEAD correctly' '
364 git bundle create bundle5 HEAD master &&
365 git bundle list-heads bundle5 >actual &&
366 for h in HEAD refs/heads/master
368 echo "$(git rev-parse --verify $h) $h"
370 test_cmp expect actual
374 test_expect_success
'mark initial state of origin/master' '
377 git tag base-origin-master refs/remotes/origin/master
381 test_expect_success
'explicit fetch should update tracking' '
384 git branch -f side &&
387 git update-ref refs/remotes/origin/master base-origin-master &&
388 o=$(git rev-parse --verify refs/remotes/origin/master) &&
389 git fetch origin master &&
390 n=$(git rev-parse --verify refs/remotes/origin/master) &&
392 test_must_fail git rev-parse --verify refs/remotes/origin/side
396 test_expect_success
'explicit pull should update tracking' '
399 git branch -f side &&
402 git update-ref refs/remotes/origin/master base-origin-master &&
403 o=$(git rev-parse --verify refs/remotes/origin/master) &&
404 git pull origin master &&
405 n=$(git rev-parse --verify refs/remotes/origin/master) &&
407 test_must_fail git rev-parse --verify refs/remotes/origin/side
411 test_expect_success
'explicit --refmap is allowed only with command-line refspec' '
415 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
419 test_expect_success
'explicit --refmap option overrides remote.*.fetch' '
421 git branch -f side &&
424 git update-ref refs/remotes/origin/master base-origin-master &&
425 o=$(git rev-parse --verify refs/remotes/origin/master) &&
426 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
427 n=$(git rev-parse --verify refs/remotes/origin/master) &&
429 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
430 git rev-parse --verify refs/remotes/other/master
434 test_expect_success
'explicitly empty --refmap option disables remote.*.fetch' '
436 git branch -f side &&
439 git update-ref refs/remotes/origin/master base-origin-master &&
440 o=$(git rev-parse --verify refs/remotes/origin/master) &&
441 git fetch --refmap="" origin master &&
442 n=$(git rev-parse --verify refs/remotes/origin/master) &&
444 test_must_fail git rev-parse --verify refs/remotes/origin/side
448 test_expect_success
'configured fetch updates tracking' '
451 git branch -f side &&
454 git update-ref refs/remotes/origin/master base-origin-master &&
455 o=$(git rev-parse --verify refs/remotes/origin/master) &&
457 n=$(git rev-parse --verify refs/remotes/origin/master) &&
459 git rev-parse --verify refs/remotes/origin/side
463 test_expect_success
'non-matching refspecs do not confuse tracking update' '
465 git update-ref refs/odd/location HEAD &&
468 git update-ref refs/remotes/origin/master base-origin-master &&
469 git config --add remote.origin.fetch \
470 refs/odd/location:refs/remotes/origin/odd &&
471 o=$(git rev-parse --verify refs/remotes/origin/master) &&
472 git fetch origin master &&
473 n=$(git rev-parse --verify refs/remotes/origin/master) &&
475 test_must_fail git rev-parse --verify refs/remotes/origin/odd
479 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
482 test_must_fail git push seven no:no
486 test_expect_success
'auto tag following fetches minimum' '
489 git clone .git follow &&
490 git checkout HEAD^0 &&
492 for i in 1 2 3 4 5 6 7
495 git commit -m $i -a &&
496 git tag -a -m $i excess-$i || exit 1
499 git checkout master &&
506 test_expect_success
'refuse to fetch into the current branch' '
508 test_must_fail git fetch . side:master
512 test_expect_success
'fetch into the current branch with --update-head-ok' '
514 git fetch --update-head-ok . side:master
518 test_expect_success
'fetch --dry-run' '
520 rm -f .git/FETCH_HEAD &&
521 git fetch --dry-run . &&
522 ! test -f .git/FETCH_HEAD
525 test_expect_success
"should be able to fetch with duplicate refspecs" '
530 git config branch.master.remote three &&
531 git config remote.three.url ../three/.git &&
532 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
533 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
538 # configured prune tests
540 set_config_tristate
() {
543 unset) test_unconfig
"$1" ;;
544 *) git config
"$1" "$2" ;;
548 test_configured_prune
() {
549 fetch_prune
=$1 remote_origin_prune
=$2 cmdline
=$3 expected
=$4
551 test_expect_success
"prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
552 # make sure a newbranch is there in . and also in one
553 git branch -f newbranch &&
556 test_unconfig fetch.prune &&
557 test_unconfig remote.origin.prune &&
559 git rev-parse --verify refs/remotes/origin/newbranch
563 git branch -d newbranch &&
568 set_config_tristate fetch.prune $fetch_prune &&
569 set_config_tristate remote.origin.prune $remote_origin_prune &&
571 git fetch $cmdline &&
574 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
577 git rev-parse --verify refs/remotes/origin/newbranch
584 test_configured_prune
unset unset "" kept
585 test_configured_prune
unset unset "--no-prune" kept
586 test_configured_prune
unset unset "--prune" pruned
588 test_configured_prune false
unset "" kept
589 test_configured_prune false
unset "--no-prune" kept
590 test_configured_prune false
unset "--prune" pruned
592 test_configured_prune true
unset "" pruned
593 test_configured_prune true
unset "--prune" pruned
594 test_configured_prune true
unset "--no-prune" kept
596 test_configured_prune
unset false
"" kept
597 test_configured_prune
unset false
"--no-prune" kept
598 test_configured_prune
unset false
"--prune" pruned
600 test_configured_prune false false
"" kept
601 test_configured_prune false false
"--no-prune" kept
602 test_configured_prune false false
"--prune" pruned
604 test_configured_prune true false
"" kept
605 test_configured_prune true false
"--prune" pruned
606 test_configured_prune true false
"--no-prune" kept
608 test_configured_prune
unset true
"" pruned
609 test_configured_prune
unset true
"--no-prune" kept
610 test_configured_prune
unset true
"--prune" pruned
612 test_configured_prune false true
"" pruned
613 test_configured_prune false true
"--no-prune" kept
614 test_configured_prune false true
"--prune" pruned
616 test_configured_prune true true
"" pruned
617 test_configured_prune true true
"--prune" pruned
618 test_configured_prune true true
"--no-prune" kept
620 test_expect_success
'all boundary commits are excluded' '
622 test_commit oneside &&
623 git checkout HEAD^ &&
624 test_commit otherside &&
625 git checkout master &&
627 git merge otherside &&
628 ad=$(git log --no-walk --format=%ad HEAD) &&
629 git bundle create twoside-boundary.bdl master --since="$ad" &&
630 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
631 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
632 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
635 test_expect_success
'fetch --prune prints the remotes url' '
636 git branch goodbye &&
637 git clone . only-prunes &&
638 git branch -D goodbye &&
641 git fetch --prune origin 2>&1 | head -n1 >../actual
643 echo "From ${D}/." >expect &&
644 test_i18ncmp expect actual
647 test_expect_success
'branchname D/F conflict resolved by --prune' '
648 git branch dir/file &&
649 git clone . prune-df-conflict &&
650 git branch -D dir/file &&
653 cd prune-df-conflict &&
655 git rev-parse origin/dir >../actual
657 git rev-parse dir >expect &&
658 test_cmp expect actual
661 test_expect_success
'fetching a one-level ref works' '
663 git reset --hard HEAD^ &&
664 git update-ref refs/foo extra &&
665 git init one-level &&
668 git fetch .. HEAD refs/foo
672 test_expect_success
'fetching with auto-gc does not lock up' '
673 write_script askyesno <<-\EOF &&
677 git clone "file://$D" auto-gc &&
681 git config gc.autoPackLimit 1 &&
682 git config gc.autoDetach false &&
683 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
684 ! grep "Should I try again" fetch.out
688 test_expect_success C_LOCALE_OUTPUT
'fetch aligned output' '
689 git clone . full-output &&
690 test_commit looooooooooooong-tag &&
693 git -c fetch.output=full fetch origin 2>&1 | \
694 grep -e "->" | cut -c 22- >../actual
696 cat >expect <<-\EOF &&
697 master -> origin/master
698 looooooooooooong-tag -> looooooooooooong-tag
700 test_cmp expect actual
703 test_expect_success C_LOCALE_OUTPUT
'fetch compact output' '
704 git clone . compact &&
705 test_commit extraaa &&
708 git -c fetch.output=compact fetch origin 2>&1 | \
709 grep -e "->" | cut -c 22- >../actual
711 cat >expect <<-\EOF &&
715 test_cmp expect actual