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 grep " -> refs/crazyheads/descriptive-branch$" actual |
226 test_i18ngrep "new branch" &&
227 grep " -> descriptive-tag$" actual |
228 test_i18ngrep "new tag" &&
229 grep " -> crazy$" actual |
230 test_i18ngrep "new ref"
235 test_expect_success
'fetch must not resolve short tag name' '
243 test_must_fail git fetch .. anno:five
247 test_expect_success
'fetch can now resolve short remote name' '
250 git update-ref refs/remotes/six/HEAD HEAD &&
259 test_expect_success
'create bundle 1' '
261 echo >file updated again by origin &&
262 git commit -a -m "tip" &&
263 git bundle create bundle1 master^..master
266 test_expect_success
'header of bundle looks right' '
267 head -n 1 "$D"/bundle1 | grep "^#" &&
268 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
269 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
270 head -n 4 "$D"/bundle1 | grep "^$"
273 test_expect_success
'create bundle 2' '
275 git bundle create bundle2 master~2..master
278 test_expect_success
'unbundle 1' '
280 git checkout -b some-branch &&
281 test_must_fail git fetch "$D/bundle1" master:master
285 test_expect_success
'bundle 1 has only 3 files ' '
287 convert_bundle_to_pack <bundle1 >bundle.pack &&
288 git index-pack bundle.pack &&
289 test_bundle_object_count bundle.pack 3
292 test_expect_success
'unbundle 2' '
294 git fetch ../bundle2 master:master &&
295 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
298 test_expect_success
'bundle does not prerequisite objects' '
302 git commit -m add.file2 file2 &&
303 git bundle create bundle3 -1 HEAD &&
304 convert_bundle_to_pack <bundle3 >bundle.pack &&
305 git index-pack bundle.pack &&
306 test_bundle_object_count bundle.pack 3
309 test_expect_success
'bundle should be able to create a full history' '
312 git tag -a -m '1.0' v1.0 master &&
313 git bundle create bundle4 v1.0
317 ! rsync
--help > /dev
/null
2> /dev
/null
&&
318 say
'Skipping rsync tests because rsync was not found' ||
319 test_set_prereq RSYNC
321 test_expect_success RSYNC
'fetch via rsync' '
326 git fetch "rsync:../.git" master:refs/heads/master &&
328 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
332 test_expect_success RSYNC
'push via rsync' '
337 git push "rsync:../rsynced2/.git" master) &&
340 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
344 test_expect_success RSYNC
'push via rsync' '
348 git push --all "rsync:rsynced3/.git" &&
350 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
354 test_expect_success
'fetch with a non-applying branch.<name>.merge' '
355 git config branch.master.remote yeti &&
356 git config branch.master.merge refs/heads/bigfoot &&
357 git config remote.blub.url one &&
358 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
362 # URL supplied to fetch does not match the url of the configured branch's remote
363 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
364 one_head=$(cd one && git rev-parse HEAD) &&
365 this_head=$(git rev-parse HEAD) &&
366 git update-ref -d FETCH_HEAD &&
368 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
369 test $this_head = "$(git rev-parse --verify HEAD)"
372 # URL supplied to fetch matches the url of the configured branch's remote and
373 # the merge spec matches the branch the remote HEAD points to
374 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
375 one_ref=$(cd one && git symbolic-ref HEAD) &&
376 git config branch.master.remote blub &&
377 git config branch.master.merge "$one_ref" &&
378 git update-ref -d FETCH_HEAD &&
380 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
381 test $this_head = "$(git rev-parse --verify HEAD)"
384 # URL supplied to fetch matches the url of the configured branch's remote, but
385 # the merge spec does not match the branch the remote HEAD points to
386 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
387 git config branch.master.merge "${one_ref}_not" &&
388 git update-ref -d FETCH_HEAD &&
390 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
391 test $this_head = "$(git rev-parse --verify HEAD)"
394 # the strange name is: a\!'b
395 test_expect_success
'quoting of a strangely named repo' '
396 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
398 grep "fatal: '\''a\\\\!'\''b'\''" result
401 test_expect_success
'bundle should record HEAD correctly' '
404 git bundle create bundle5 HEAD master &&
405 git bundle list-heads bundle5 >actual &&
406 for h in HEAD refs/heads/master
408 echo "$(git rev-parse --verify $h) $h"
410 test_cmp expect actual
414 test_expect_success
'mark initial state of origin/master' '
417 git tag base-origin-master refs/remotes/origin/master
421 test_expect_success
'explicit fetch should update tracking' '
424 git branch -f side &&
427 git update-ref refs/remotes/origin/master base-origin-master &&
428 o=$(git rev-parse --verify refs/remotes/origin/master) &&
429 git fetch origin master &&
430 n=$(git rev-parse --verify refs/remotes/origin/master) &&
432 test_must_fail git rev-parse --verify refs/remotes/origin/side
436 test_expect_success
'explicit pull should update tracking' '
439 git branch -f side &&
442 git update-ref refs/remotes/origin/master base-origin-master &&
443 o=$(git rev-parse --verify refs/remotes/origin/master) &&
444 git pull origin master &&
445 n=$(git rev-parse --verify refs/remotes/origin/master) &&
447 test_must_fail git rev-parse --verify refs/remotes/origin/side
451 test_expect_success
'explicit --refmap is allowed only with command-line refspec' '
455 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
459 test_expect_success
'explicit --refmap option overrides remote.*.fetch' '
461 git branch -f side &&
464 git update-ref refs/remotes/origin/master base-origin-master &&
465 o=$(git rev-parse --verify refs/remotes/origin/master) &&
466 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
467 n=$(git rev-parse --verify refs/remotes/origin/master) &&
469 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
470 git rev-parse --verify refs/remotes/other/master
474 test_expect_success
'explicitly empty --refmap option disables remote.*.fetch' '
476 git branch -f side &&
479 git update-ref refs/remotes/origin/master base-origin-master &&
480 o=$(git rev-parse --verify refs/remotes/origin/master) &&
481 git fetch --refmap="" origin master &&
482 n=$(git rev-parse --verify refs/remotes/origin/master) &&
484 test_must_fail git rev-parse --verify refs/remotes/origin/side
488 test_expect_success
'configured fetch updates tracking' '
491 git branch -f side &&
494 git update-ref refs/remotes/origin/master base-origin-master &&
495 o=$(git rev-parse --verify refs/remotes/origin/master) &&
497 n=$(git rev-parse --verify refs/remotes/origin/master) &&
499 git rev-parse --verify refs/remotes/origin/side
503 test_expect_success
'non-matching refspecs do not confuse tracking update' '
505 git update-ref refs/odd/location HEAD &&
508 git update-ref refs/remotes/origin/master base-origin-master &&
509 git config --add remote.origin.fetch \
510 refs/odd/location:refs/remotes/origin/odd &&
511 o=$(git rev-parse --verify refs/remotes/origin/master) &&
512 git fetch origin master &&
513 n=$(git rev-parse --verify refs/remotes/origin/master) &&
515 test_must_fail git rev-parse --verify refs/remotes/origin/odd
519 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
522 test_must_fail git push seven no:no
526 test_expect_success
'auto tag following fetches minimum' '
529 git clone .git follow &&
530 git checkout HEAD^0 &&
532 for i in 1 2 3 4 5 6 7
535 git commit -m $i -a &&
536 git tag -a -m $i excess-$i || exit 1
539 git checkout master &&
546 test_expect_success
'refuse to fetch into the current branch' '
548 test_must_fail git fetch . side:master
552 test_expect_success
'fetch into the current branch with --update-head-ok' '
554 git fetch --update-head-ok . side:master
558 test_expect_success
'fetch --dry-run' '
560 rm -f .git/FETCH_HEAD &&
561 git fetch --dry-run . &&
562 ! test -f .git/FETCH_HEAD
565 test_expect_success
"should be able to fetch with duplicate refspecs" '
570 git config branch.master.remote three &&
571 git config remote.three.url ../three/.git &&
572 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
573 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
578 # configured prune tests
580 set_config_tristate
() {
583 unset) test_unconfig
"$1" ;;
584 *) git config
"$1" "$2" ;;
588 test_configured_prune
() {
589 fetch_prune
=$1 remote_origin_prune
=$2 cmdline
=$3 expected
=$4
591 test_expect_success
"prune fetch.prune=$1 remote.origin.prune=$2${3:+ $3}; $4" '
592 # make sure a newbranch is there in . and also in one
593 git branch -f newbranch &&
596 test_unconfig fetch.prune &&
597 test_unconfig remote.origin.prune &&
599 git rev-parse --verify refs/remotes/origin/newbranch
603 git branch -d newbranch &&
608 set_config_tristate fetch.prune $fetch_prune &&
609 set_config_tristate remote.origin.prune $remote_origin_prune &&
611 git fetch $cmdline &&
614 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
617 git rev-parse --verify refs/remotes/origin/newbranch
624 test_configured_prune
unset unset "" kept
625 test_configured_prune
unset unset "--no-prune" kept
626 test_configured_prune
unset unset "--prune" pruned
628 test_configured_prune false
unset "" kept
629 test_configured_prune false
unset "--no-prune" kept
630 test_configured_prune false
unset "--prune" pruned
632 test_configured_prune true
unset "" pruned
633 test_configured_prune true
unset "--prune" pruned
634 test_configured_prune true
unset "--no-prune" kept
636 test_configured_prune
unset false
"" kept
637 test_configured_prune
unset false
"--no-prune" kept
638 test_configured_prune
unset false
"--prune" pruned
640 test_configured_prune false false
"" kept
641 test_configured_prune false false
"--no-prune" kept
642 test_configured_prune false false
"--prune" pruned
644 test_configured_prune true false
"" kept
645 test_configured_prune true false
"--prune" pruned
646 test_configured_prune true false
"--no-prune" kept
648 test_configured_prune
unset true
"" pruned
649 test_configured_prune
unset true
"--no-prune" kept
650 test_configured_prune
unset true
"--prune" pruned
652 test_configured_prune false true
"" pruned
653 test_configured_prune false true
"--no-prune" kept
654 test_configured_prune false true
"--prune" pruned
656 test_configured_prune true true
"" pruned
657 test_configured_prune true true
"--prune" pruned
658 test_configured_prune true true
"--no-prune" kept
660 test_expect_success
'all boundary commits are excluded' '
662 test_commit oneside &&
663 git checkout HEAD^ &&
664 test_commit otherside &&
665 git checkout master &&
667 git merge otherside &&
668 ad=$(git log --no-walk --format=%ad HEAD) &&
669 git bundle create twoside-boundary.bdl master --since="$ad" &&
670 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
671 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
672 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
675 test_expect_success
'fetch --prune prints the remotes url' '
676 git branch goodbye &&
677 git clone . only-prunes &&
678 git branch -D goodbye &&
681 git fetch --prune origin 2>&1 | head -n1 >../actual
683 echo "From ${D}/." >expect &&
684 test_cmp expect actual
687 test_expect_success
'branchname D/F conflict resolved by --prune' '
688 git branch dir/file &&
689 git clone . prune-df-conflict &&
690 git branch -D dir/file &&
693 cd prune-df-conflict &&
695 git rev-parse origin/dir >../actual
697 git rev-parse dir >expect &&
698 test_cmp expect actual
701 test_expect_success
'fetching a one-level ref works' '
703 git reset --hard HEAD^ &&
704 git update-ref refs/foo extra &&
705 git init one-level &&
708 git fetch .. HEAD refs/foo