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` &&
81 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 fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
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 fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
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 --tags does not delete the remote-tracking branches' '
118 git clone . prune-tags &&
120 git fetch origin refs/heads/master:refs/tags/sometag &&
122 git fetch --prune --tags origin &&
123 git rev-parse origin/master &&
124 test_must_fail git rev-parse somebranch
127 test_expect_success
'fetch --prune --tags with branch does not delete other remote-tracking branches' '
129 git clone . prune-tags-branch &&
130 cd prune-tags-branch &&
131 git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
133 git fetch --prune --tags origin master &&
134 git rev-parse origin/extrabranch
137 test_expect_success
'fetch tags when there is no tags' '
149 test_expect_success
'fetch following tags' '
152 git tag -a -m 'annotated
' anno HEAD &&
153 git tag light HEAD &&
159 git fetch .. :track &&
160 git show-ref --verify refs/tags/anno &&
161 git show-ref --verify refs/tags/light
165 test_expect_success
'fetch must not resolve short tag name' '
173 test_must_fail git fetch .. anno:five
177 test_expect_success
'fetch must not resolve short remote name' '
180 git update-ref refs/remotes/six/HEAD HEAD &&
186 test_must_fail git fetch .. six:six
190 test_expect_success
'create bundle 1' '
192 echo >file updated again by origin &&
193 git commit -a -m "tip" &&
194 git bundle create bundle1 master^..master
197 test_expect_success
'header of bundle looks right' '
198 head -n 1 "$D"/bundle1 | grep "^#" &&
199 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
200 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
201 head -n 4 "$D"/bundle1 | grep "^$"
204 test_expect_success
'create bundle 2' '
206 git bundle create bundle2 master~2..master
209 test_expect_success
'unbundle 1' '
211 git checkout -b some-branch &&
212 test_must_fail git fetch "$D/bundle1" master:master
216 test_expect_success
'bundle 1 has only 3 files ' '
218 convert_bundle_to_pack <bundle1 >bundle.pack &&
219 git index-pack bundle.pack &&
220 test_bundle_object_count bundle.pack 3
223 test_expect_success
'unbundle 2' '
225 git fetch ../bundle2 master:master &&
226 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
229 test_expect_success
'bundle does not prerequisite objects' '
233 git commit -m add.file2 file2 &&
234 git bundle create bundle3 -1 HEAD &&
235 convert_bundle_to_pack <bundle3 >bundle.pack &&
236 git index-pack bundle.pack &&
237 test_bundle_object_count bundle.pack 3
240 test_expect_success
'bundle should be able to create a full history' '
243 git tag -a -m '1.0' v1.0 master &&
244 git bundle create bundle4 v1.0
248 ! rsync
--help > /dev
/null
2> /dev
/null
&&
249 say
'Skipping rsync tests because rsync was not found' ||
{
250 test_expect_success
'fetch via rsync' '
255 git fetch "rsync:$(pwd)/../.git" master:refs/heads/master &&
257 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
261 test_expect_success
'push via rsync' '
266 git push "rsync:$(pwd)/../rsynced2/.git" master) &&
269 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
273 test_expect_success
'push via rsync' '
277 git push --all "rsync:$(pwd)/rsynced3/.git" &&
279 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
284 test_expect_success
'fetch with a non-applying branch.<name>.merge' '
285 git config branch.master.remote yeti &&
286 git config branch.master.merge refs/heads/bigfoot &&
287 git config remote.blub.url one &&
288 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
292 # URL supplied to fetch does not match the url of the configured branch's remote
293 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
294 one_head=$(cd one && git rev-parse HEAD) &&
295 this_head=$(git rev-parse HEAD) &&
296 git update-ref -d FETCH_HEAD &&
298 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
299 test $this_head = "$(git rev-parse --verify HEAD)"
302 # URL supplied to fetch matches the url of the configured branch's remote and
303 # the merge spec matches the branch the remote HEAD points to
304 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
305 one_ref=$(cd one && git symbolic-ref HEAD) &&
306 git config branch.master.remote blub &&
307 git config branch.master.merge "$one_ref" &&
308 git update-ref -d FETCH_HEAD &&
310 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
311 test $this_head = "$(git rev-parse --verify HEAD)"
314 # URL supplied to fetch matches the url of the configured branch's remote, but
315 # the merge spec does not match the branch the remote HEAD points to
316 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
317 git config branch.master.merge "${one_ref}_not" &&
318 git update-ref -d FETCH_HEAD &&
320 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
321 test $this_head = "$(git rev-parse --verify HEAD)"
324 # the strange name is: a\!'b
325 test_expect_success
'quoting of a strangely named repo' '
326 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
328 grep "fatal: '\''a\\\\!'\''b'\''" result
331 test_expect_success
'bundle should record HEAD correctly' '
334 git bundle create bundle5 HEAD master &&
335 git bundle list-heads bundle5 >actual &&
336 for h in HEAD refs/heads/master
338 echo "$(git rev-parse --verify $h) $h"
340 test_cmp expect actual
344 test_expect_success
'explicit fetch should not update tracking' '
347 git branch -f side &&
350 o=$(git rev-parse --verify refs/remotes/origin/master) &&
351 git fetch origin master &&
352 n=$(git rev-parse --verify refs/remotes/origin/master) &&
354 test_must_fail git rev-parse --verify refs/remotes/origin/side
358 test_expect_success
'explicit pull should not update tracking' '
361 git branch -f side &&
364 o=$(git rev-parse --verify refs/remotes/origin/master) &&
365 git pull origin master &&
366 n=$(git rev-parse --verify refs/remotes/origin/master) &&
368 test_must_fail git rev-parse --verify refs/remotes/origin/side
372 test_expect_success
'configured fetch updates tracking' '
375 git branch -f side &&
378 o=$(git rev-parse --verify refs/remotes/origin/master) &&
380 n=$(git rev-parse --verify refs/remotes/origin/master) &&
382 git rev-parse --verify refs/remotes/origin/side
386 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
389 test_must_fail git push seven no:no
393 test_expect_success
'auto tag following fetches minimum' '
396 git clone .git follow &&
397 git checkout HEAD^0 &&
399 for i in 1 2 3 4 5 6 7
402 git commit -m $i -a &&
403 git tag -a -m $i excess-$i || exit 1
406 git checkout master &&
413 test_expect_success
'refuse to fetch into the current branch' '
415 test_must_fail git fetch . side:master
419 test_expect_success
'fetch into the current branch with --update-head-ok' '
421 git fetch --update-head-ok . side:master
425 test_expect_success
'fetch --dry-run' '
427 rm -f .git/FETCH_HEAD &&
428 git fetch --dry-run . &&
429 ! test -f .git/FETCH_HEAD
432 test_expect_success
"should be able to fetch with duplicate refspecs" '
437 git config branch.master.remote three &&
438 git config remote.three.url ../three/.git &&
439 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
440 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
445 test_expect_success
'all boundary commits are excluded' '
447 test_commit oneside &&
448 git checkout HEAD^ &&
449 test_commit otherside &&
450 git checkout master &&
452 git merge otherside &&
453 ad=$(git log --no-walk --format=%ad HEAD) &&
454 git bundle create twoside-boundary.bdl master --since="$ad" &&
455 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
456 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
457 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3