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 test_expect_success setup
'
18 echo >file original &&
20 git commit -a -m original'
22 test_expect_success
"clone and setup child repos" '
26 echo >file updated by one &&
27 git commit -a -m "updated by one"
32 git config branch.master.remote one &&
33 git config remote.one.url ../one/.git/ &&
34 git config remote.one.fetch refs/heads/master:refs/heads/one
39 git config branch.master.remote two &&
40 git config branch.master.merge refs/heads/one &&
41 mkdir -p .git/remotes &&
43 echo "URL: ../two/.git/"
44 echo "Pull: refs/heads/master:refs/heads/two"
45 echo "Pull: refs/heads/one:refs/heads/one"
52 test_expect_success
"fetch test" '
54 echo >file updated by origin &&
55 git commit -a -m "updated by origin" &&
58 test -f .git/refs/heads/one &&
59 mine=`git rev-parse refs/heads/one` &&
60 his=`cd ../one && git rev-parse refs/heads/master` &&
61 test "z$mine" = "z$his"
64 test_expect_success
"fetch test for-merge" '
68 test -f .git/refs/heads/two &&
69 test -f .git/refs/heads/one &&
70 master_in_two=`cd ../two && git rev-parse master` &&
71 one_in_two=`cd ../two && git rev-parse one` &&
73 echo "$master_in_two not-for-merge"
76 cut -f -2 .git/FETCH_HEAD >actual &&
77 test_cmp expected actual'
79 test_expect_success
'fetch tags when there is no tags' '
91 test_expect_success
'fetch following tags' '
94 git tag -a -m 'annotated
' anno HEAD &&
101 git fetch .. :track &&
102 git show-ref --verify refs/tags/anno &&
103 git show-ref --verify refs/tags/light
107 test_expect_success
'fetch must not resolve short tag name' '
115 test_must_fail git fetch .. anno:five
119 test_expect_success
'fetch can now resolve short remote name' '
122 git update-ref refs/remotes/six/HEAD HEAD &&
131 test_expect_success
'create bundle 1' '
133 echo >file updated again by origin &&
134 git commit -a -m "tip" &&
135 git bundle create bundle1 master^..master
138 test_expect_success
'header of bundle looks right' '
139 head -n 1 "$D"/bundle1 | grep "^#" &&
140 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
141 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
142 head -n 4 "$D"/bundle1 | grep "^$"
145 test_expect_success
'create bundle 2' '
147 git bundle create bundle2 master~2..master
150 test_expect_success
'unbundle 1' '
152 git checkout -b some-branch &&
153 test_must_fail git fetch "$D/bundle1" master:master
157 test_expect_success
'bundle 1 has only 3 files ' '
160 while read x && test -n "$x"
165 ) <bundle1 >bundle.pack &&
166 git index-pack bundle.pack &&
167 test_bundle_object_count bundle.pack 3
170 test_expect_success
'unbundle 2' '
172 git fetch ../bundle2 master:master &&
173 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
176 test_expect_success
'bundle does not prerequisite objects' '
180 git commit -m add.file2 file2 &&
181 git bundle create bundle3 -1 HEAD &&
183 while read x && test -n "$x"
188 ) <bundle3 >bundle.pack &&
189 git index-pack bundle.pack &&
190 test_bundle_object_count bundle.pack 3
193 test_expect_success
'bundle should be able to create a full history' '
196 git tag -a -m '1.0' v1.0 master &&
197 git bundle create bundle4 v1.0
201 ! rsync
--help > /dev
/null
2> /dev
/null
&&
202 say
'Skipping rsync tests because rsync was not found' ||
{
203 test_expect_success
'fetch via rsync' '
208 git fetch "rsync:$(pwd)/../.git" master:refs/heads/master &&
210 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
214 test_expect_success
'push via rsync' '
219 git push "rsync:$(pwd)/../rsynced2/.git" master) &&
222 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
226 test_expect_success
'push via rsync' '
230 git push --all "rsync:$(pwd)/rsynced3/.git" &&
232 test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
237 test_expect_success
'fetch with a non-applying branch.<name>.merge' '
238 git config branch.master.remote yeti &&
239 git config branch.master.merge refs/heads/bigfoot &&
240 git config remote.blub.url one &&
241 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
245 # URL supplied to fetch does not match the url of the configured branch's remote
246 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
247 one_head=$(cd one && git rev-parse HEAD) &&
248 this_head=$(git rev-parse HEAD) &&
249 git update-ref -d FETCH_HEAD &&
251 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
252 test $this_head = "$(git rev-parse --verify HEAD)"
255 # URL supplied to fetch matches the url of the configured branch's remote and
256 # the merge spec matches the branch the remote HEAD points to
257 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
258 one_ref=$(cd one && git symbolic-ref HEAD) &&
259 git config branch.master.remote blub &&
260 git config branch.master.merge "$one_ref" &&
261 git update-ref -d FETCH_HEAD &&
263 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
264 test $this_head = "$(git rev-parse --verify HEAD)"
267 # URL supplied to fetch matches the url of the configured branch's remote, but
268 # the merge spec does not match the branch the remote HEAD points to
269 test_expect_success
'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
270 git config branch.master.merge "${one_ref}_not" &&
271 git update-ref -d FETCH_HEAD &&
273 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
274 test $this_head = "$(git rev-parse --verify HEAD)"
277 # the strange name is: a\!'b
278 test_expect_success
'quoting of a strangely named repo' '
279 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
281 grep "fatal: '\''a\\\\!'\''b'\''" result
284 test_expect_success
'bundle should record HEAD correctly' '
287 git bundle create bundle5 HEAD master &&
288 git bundle list-heads bundle5 >actual &&
289 for h in HEAD refs/heads/master
291 echo "$(git rev-parse --verify $h) $h"
293 test_cmp expect actual
297 test_expect_success
'explicit fetch should not update tracking' '
300 git branch -f side &&
303 o=$(git rev-parse --verify refs/remotes/origin/master) &&
304 git fetch origin master &&
305 n=$(git rev-parse --verify refs/remotes/origin/master) &&
307 test_must_fail git rev-parse --verify refs/remotes/origin/side
311 test_expect_success
'explicit pull should not update tracking' '
314 git branch -f side &&
317 o=$(git rev-parse --verify refs/remotes/origin/master) &&
318 git pull origin master &&
319 n=$(git rev-parse --verify refs/remotes/origin/master) &&
321 test_must_fail git rev-parse --verify refs/remotes/origin/side
325 test_expect_success
'configured fetch updates tracking' '
328 git branch -f side &&
331 o=$(git rev-parse --verify refs/remotes/origin/master) &&
333 n=$(git rev-parse --verify refs/remotes/origin/master) &&
335 git rev-parse --verify refs/remotes/origin/side
339 test_expect_success
'pushing nonexistent branch by mistake should not segv' '
342 test_must_fail git push seven no:no
346 test_expect_success
'auto tag following fetches minimum' '
349 git clone .git follow &&
350 git checkout HEAD^0 &&
352 for i in 1 2 3 4 5 6 7
355 git commit -m $i -a &&
356 git tag -a -m $i excess-$i || exit 1
359 git checkout master &&
366 test_expect_success
'refuse to fetch into the current branch' '
368 test_must_fail git fetch . side:master
372 test_expect_success
'fetch into the current branch with --update-head-ok' '
374 git fetch --update-head-ok . side:master
378 test_expect_success
'fetch --dry-run' '
380 rm -f .git/FETCH_HEAD &&
381 git fetch --dry-run . &&
382 ! test -f .git/FETCH_HEAD
385 test_expect_success
"should be able to fetch with duplicate refspecs" '
389 git config branch.master.remote three &&
390 git config remote.three.url ../three/.git &&
391 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
392 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&